tony2001 Mon, 03 Aug 2009 08:45:28 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286719
Log:
revert bogus memleak fix causing Valgrind to scream
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c
U php/php-src/branches/PHP_5_3/NEWS
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-08-03 07:30:49 UTC (rev 286718)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-08-03 08:45:28 UTC (rev 286719)
@@ -3,7 +3,6 @@
?? ??? 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 #49132 (posix_times returns false without error).
(phpbugs at gunnu dot us)
Modified: php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c 2009-08-03
07:30:49 UTC (rev 286718)
+++ php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c 2009-08-03
08:45:28 UTC (rev 286719)
@@ -1399,7 +1399,6 @@
} 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/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-08-03 07:30:49 UTC (rev 286718)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-08-03 08:45:28 UTC (rev 286719)
@@ -6,7 +6,6 @@
- Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz,
Stas)
- Fixed signature generation/validation for zip archives in ext/phar. (Greg)
-- Fixed memory leak in stream_is_local(). (Felipe)
- Fixed bug #49132 (posix_times returns false without error).
(phpbugs at gunnu dot us)
Modified: php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c 2009-08-03
07:30:49 UTC (rev 286718)
+++ php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c 2009-08-03
08:45:28 UTC (rev 286719)
@@ -1465,7 +1465,6 @@
} 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-08-03 07:30:49 UTC
(rev 286718)
+++ php/php-src/trunk/ext/standard/streamsfuncs.c 2009-08-03 08:45:28 UTC
(rev 286719)
@@ -1752,7 +1752,6 @@
} 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
