[PHP-CVS] svn: /php/php-src/trunk/main/ main.c

[Jani Taskinen]

jani                                     Tue, 08 Dec 2009 08:21:25 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=291865

Log:
MF52: Fixed memory leak on require() error (Thanks again Ilia. r220154)

Changed paths:
    U   php/php-src/trunk/main/main.c

Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c       2009-12-08 08:20:12 UTC (rev 291864)
+++ php/php-src/trunk/main/main.c       2009-12-08 08:21:25 UTC (rev 291865)
@@ -883,8 +883,6 @@
        if (docref_buf) {
                efree(docref_buf);
        }
-       php_error(type, "%s", message);
-       efree(message);

        if (PG(track_errors) && module_initialized &&
                        (!EG(user_error_handler) || 
!(EG(user_error_handler_error_reporting) & type))) {
@@ -899,6 +897,9 @@
                }
        }
        efree(buffer);
+
+       php_error(type, "%s", message);
+       efree(message);
 }
 /* }}} */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php