pajoye Wed, 28 Oct 2009 11:08:33 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=290026
Log: - Merge revision 289987, Fixed bug #49142 (crash when exception thrown from __tostring()) Bug: http://bugs.php.net/49142 (Closed) crash when exception thrown from __tostring() (PHP_5_3 only!) Changed paths: _U php/php-src/branches/PHP_5_3_1/ UU php/php-src/branches/PHP_5_3_1/NEWS U php/php-src/branches/PHP_5_3_1/Zend/zend.c _U php/php-src/branches/PHP_5_3_1/ext/mysql/ _U php/php-src/branches/PHP_5_3_1/ext/mysqli/ _U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/ _U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/ _U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/ _U php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt Property changes on: php/php-src/branches/PHP_5_3_1 ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289990 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_1/NEWS =================================================================== --- php/php-src/branches/PHP_5_3_1/NEWS 2009-10-28 11:03:36 UTC (rev 290025) +++ php/php-src/branches/PHP_5_3_1/NEWS 2009-10-28 11:08:33 UTC (rev 290026) @@ -7,6 +7,8 @@ - Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre) +- Fixed bug #49142 (crash when exception thrown from __tostring()). + (David Soria Parra) - Fixed bug #49986 (Missing ICU DLLs on windows package). (Pierre) - Fixed bug #48752 (Crash during date parsing with invalid date). (Pierre) 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,289990 /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 /php/php-src/trunk/NEWS:284726 Modified: php/php-src/branches/PHP_5_3_1/Zend/zend.c =================================================================== --- php/php-src/branches/PHP_5_3_1/Zend/zend.c 2009-10-28 11:03:36 UTC (rev 290025) +++ php/php-src/branches/PHP_5_3_1/Zend/zend.c 2009-10-28 11:08:33 UTC (rev 290026) @@ -1067,10 +1067,16 @@ if (!EG(active_symbol_table)) { zend_rebuild_symbol_table(TSRMLS_C); } - Z_ARRVAL_P(z_context) = EG(active_symbol_table); - Z_TYPE_P(z_context) = IS_ARRAY; - zval_copy_ctor(z_context); + /* during shutdown the symbol table table can be still null */ + if (!EG(active_symbol_table)) { + Z_TYPE_P(z_context) = IS_NULL; + } else { + Z_ARRVAL_P(z_context) = EG(active_symbol_table); + Z_TYPE_P(z_context) = IS_ARRAY; + zval_copy_ctor(z_context); + } + params = (zval ***) emalloc(sizeof(zval **)*5); params[0] = &z_error_type; params[1] = &z_error_message; Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289990 /php/php-src/trunk/ext/mysql:284726 + /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990 /php/php-src/trunk/ext/mysql: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,289990 /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 /php/php-src/trunk/ext/mysqli:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqlnd ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289990 /php/php-src/trunk/ext/mysqlnd:284726 + /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990 /php/php-src/trunk/ext/mysqlnd:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/pdo_mysql ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289990 /php/php-src/trunk/ext/pdo_mysql:284726 + /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990 /php/php-src/trunk/ext/pdo_mysql:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/tidy/tests ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289990 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289990 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php