iliaa Thu, 24 Mar 2011 12:57:38 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309647
Log:
Fixed a crash inside dtor for error handling.
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/main/main.c
U php/php-src/trunk/main/main.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2011-03-24 12:35:17 UTC (rev 309646)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-03-24 12:57:38 UTC (rev 309647)
@@ -8,6 +8,7 @@
- Core:
. Fixed bug #54180 (parse_url() incorrectly parses path when ? in fragment).
(tomas dot brastavicius at quantum dot lt, Pierrick)
+ . Fixed a crash inside dtor for error handling. (Ilia)
- DateTime extension:
. Fixed bug #54340 (DateTime::add() method bug). (Adam)
Modified: php/php-src/branches/PHP_5_3/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/main.c 2011-03-24 12:35:17 UTC (rev
309646)
+++ php/php-src/branches/PHP_5_3/main/main.c 2011-03-24 12:57:38 UTC (rev
309647)
@@ -908,9 +908,11 @@
if (display) {
if (PG(last_error_message)) {
free(PG(last_error_message));
+ PG(last_error_message) = NULL;
}
if (PG(last_error_file)) {
free(PG(last_error_file));
+ PG(last_error_file) = NULL;
}
if (!error_filename) {
error_filename = "Unknown";
Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c 2011-03-24 12:35:17 UTC (rev 309646)
+++ php/php-src/trunk/main/main.c 2011-03-24 12:57:38 UTC (rev 309647)
@@ -880,9 +880,11 @@
if (display) {
if (PG(last_error_message)) {
free(PG(last_error_message));
+ PG(last_error_message) = NULL;
}
if (PG(last_error_file)) {
free(PG(last_error_file));
+ PG(last_error_file) = NULL;
}
if (!error_filename) {
error_filename = "Unknown";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
