[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS ext/standard/string.c

2012-03-01 Thread Pierrick Charron
pierrick Thu, 01 Mar 2012 15:10:29 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=323710

Log:
Fixed memory leak in substr_replace

Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/standard/string.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-01 15:10:23 UTC (rev 323709)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-01 15:10:29 UTC (rev 323710)
@@ -1,7 +1,10 @@
 PHPNEWS
 |||
 ?? ??? 2012, PHP 5.4.1 RC1
-
+
+- Standard:
+  . Fixed memory leak in substr_replace. (Pierrick)
+
 01 Mar 2012, PHP 5.4.0

 - autoconf 2.59+ is now supported (and required) for generating the

Modified: php/php-src/branches/PHP_5_4/ext/standard/string.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/string.c  2012-03-01 15:10:23 UTC 
(rev 323709)
+++ php/php-src/branches/PHP_5_4/ext/standard/string.c  2012-03-01 15:10:29 UTC 
(rev 323710)
@@ -2518,6 +2518,9 @@

if(Z_REFCOUNT_P(orig_str) != refcount) {
php_error_docref(NULL 
TSRMLS_CC, E_WARNING, Argument was modified while replacing);
+   if(Z_TYPE_PP(tmp_repl) != 
IS_STRING) {
+   zval_dtor(repl_str);
+   }
break;
}


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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS ext/standard/string.c

2012-03-01 Thread Antony Dovgal

On 03/01/2012 07:10 PM, Pierrick Charron wrote:

pierrick Thu, 01 Mar 2012 15:10:29 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=323710

Log:
Fixed memory leak in substr_replace


+test ?

--
Wbr,
Antony Dovgal
---
http://pinba.org - realtime profiling for PHP

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



Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS ext/standard/string.c

2012-03-01 Thread Pierrick Charron
Test for bug #55871 is already covering this issue.

P.

On 1 March 2012 11:35, Antony Dovgal t...@daylessday.org wrote:
 On 03/01/2012 07:10 PM, Pierrick Charron wrote:

 pierrick                                 Thu, 01 Mar 2012 15:10:29 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=323710

 Log:
 Fixed memory leak in substr_replace


 +test ?

 --
 Wbr,
 Antony Dovgal
 ---
 http://pinba.org - realtime profiling for PHP

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


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