tony2001 Tue Dec 20 09:47:57 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/main/streams streams.c
Log:
fix #35740 (memory leak when including a directory)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.304&r2=1.2027.2.305&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.304 php-src/NEWS:1.2027.2.305
--- php-src/NEWS:1.2027.2.304 Mon Dec 19 14:18:05 2005
+++ php-src/NEWS Tue Dec 20 09:47:57 2005
@@ -30,6 +30,7 @@
- Fixed many bugs in OCI8. (Tony)
- Fixed crash and leak in mysqli when using 4.1.x client libraries and
connecting to 5.x server. (Andrey)
+- Fixed bug #35740 (memory leak when including a directory). (Tony)
- Fixed bug #35723 (xmlrpc_introspection.c fails compile per C99 std). (Jani)
- Fixed bug #35720 (A final constructor can be overwritten). (Marcus)
- Fixed bug #35713 (getopt() returns array with numeric strings when passed
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/streams.c?r1=1.82.2.1&r2=1.82.2.2&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.1
php-src/main/streams/streams.c:1.82.2.2
--- php-src/main/streams/streams.c:1.82.2.1 Mon Dec 5 23:38:04 2005
+++ php-src/main/streams/streams.c Tue Dec 20 09:47:57 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.82.2.1 2005/12/05 23:38:04 sniper Exp $ */
+/* $Id: streams.c,v 1.82.2.2 2005/12/20 09:47:57 tony2001 Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1831,6 +1831,10 @@
if (stream == NULL && (options & REPORT_ERRORS)) {
php_stream_display_wrapper_errors(wrapper, path, "failed to
open stream" TSRMLS_CC);
+ if (opened_path && *opened_path) {
+ efree(*opened_path);
+ *opened_path = NULL;
+ }
}
php_stream_tidy_wrapper_error_log(wrapper TSRMLS_CC);
#if ZEND_DEBUG
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
