Felipe Pena wrote:
felipe Wed, 29 Jul 2009 19:09:17 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286531
Log:
- Fixed memleak in stream_is_local()
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
You forgot the PHP_5_3/NEWS..
--Jani
U php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c
U php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c
U php/php-src/trunk/ext/standard/streamsfuncs.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2009-07-29 19:07:33 UTC (rev 286530)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-07-29 19:09:17 UTC (rev 286531)
@@ -3,6 +3,7 @@
?? ??? 2009, PHP 5.2.11
- Fixed regression in cURL extension that prevented flush of data to output
defined as a file handle. (Ilia)
+- Fixed memory leak in stream_is_local(). (Felipe)
- Fixed bug #49052 (context option headers freed too early when using
--with-curlwrappers). (Jani)
Modified: php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c 2009-07-29
19:07:33 UTC (rev 286530)
+++ php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c 2009-07-29
19:09:17 UTC (rev 286531)
@@ -1399,6 +1399,7 @@
} else {
convert_to_string_ex(&zstream);
wrapper = php_stream_locate_url_wrapper(Z_STRVAL_P(zstream),
NULL, 0 TSRMLS_CC);
+ zval_ptr_dtor(&zstream);
}
if(!wrapper) {
Modified: php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c 2009-07-29
19:07:33 UTC (rev 286530)
+++ php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c 2009-07-29
19:09:17 UTC (rev 286531)
@@ -1465,6 +1465,7 @@
} else {
convert_to_string_ex(&zstream);
wrapper = php_stream_locate_url_wrapper(Z_STRVAL_P(zstream),
NULL, 0 TSRMLS_CC);
+ zval_ptr_dtor(&zstream);
}
if(!wrapper) {
Modified: php/php-src/trunk/ext/standard/streamsfuncs.c
===================================================================
--- php/php-src/trunk/ext/standard/streamsfuncs.c 2009-07-29 19:07:33 UTC
(rev 286530)
+++ php/php-src/trunk/ext/standard/streamsfuncs.c 2009-07-29 19:09:17 UTC
(rev 286531)
@@ -1752,6 +1752,7 @@
} else {
convert_to_string_ex(&zstream);
wrapper = php_stream_locate_url_wrapper(Z_STRVAL_P(zstream),
NULL, 0 TSRMLS_CC);
+ zval_ptr_dtor(&zstream);
}
if(!wrapper) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
