johannes Thu, 12 Nov 2009 17:48:36 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=290608
Log: Merge 290570 (Fix bug #49098). (Rasmus) Bug: http://bugs.php.net/49098 (Closed) Using custom session handler causes segfault in session_save_state Changed paths: UU php/php-src/branches/PHP_5_3_1/NEWS _U php/php-src/branches/PHP_5_3_1/ext/mysqli/ U php/php-src/branches/PHP_5_3_1/ext/mysqli/mysqli_nonapi.c Modified: php/php-src/branches/PHP_5_3_1/NEWS =================================================================== --- php/php-src/branches/PHP_5_3_1/NEWS 2009-11-12 17:48:03 UTC (rev 290607) +++ php/php-src/branches/PHP_5_3_1/NEWS 2009-11-12 17:48:36 UTC (rev 290608) @@ -7,6 +7,7 @@ elmerot dot se) - Fixed bug #49910 (no support for ././@LongLink for long filenames in phar tar support). (Greg) +- Fixed bug #49098 (mysqli segfault on error) (Rasmus) 03 Nov 2009, PHP 5.3.1 RC3 - Added "max_file_uploads" INI directive, which can be set to limit the Property changes on: php/php-src/branches/PHP_5_3_1/NEWS ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990,290029,290129,290147,290306,290527 /php/php-src/trunk/NEWS:284726 + /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990,290029,290129,290147,290306,290527,290570 /php/php-src/trunk/NEWS:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990,290029,290129,290147 /php/php-src/trunk/ext/mysqli:284726 + /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990,290029,290129,290147,290306,290527,290570 /php/php-src/trunk/ext/mysqli:284726 Modified: php/php-src/branches/PHP_5_3_1/ext/mysqli/mysqli_nonapi.c =================================================================== --- php/php-src/branches/PHP_5_3_1/ext/mysqli/mysqli_nonapi.c 2009-11-12 17:48:03 UTC (rev 290607) +++ php/php-src/branches/PHP_5_3_1/ext/mysqli/mysqli_nonapi.c 2009-11-12 17:48:36 UTC (rev 290608) @@ -46,7 +46,11 @@ if (MyG(error_msg)) { efree(MyG(error_msg)); } - MyG(error_msg) = estrdup(mysql_err); + if(mysql_err && *mysql_err) { + MyG(error_msg) = estrdup(mysql_err); + } else { + MyG(error_msg) = NULL; + } } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
