iliaa           Sun Aug  5 14:47:43 2007 UTC

  Added files:                 (Branch: PHP_5_2)
    /php-src/ext/standard/tests/strings bug42208.phpt 

  Modified files:              
    /php-src/ext/standard       string.c 
    /php-src    NEWS 
  Log:
  
  Fixed bug #42208 (substr_replace() crashes when the same array is passed 
  more than once)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.66&r2=1.445.2.14.2.67&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.66 
php-src/ext/standard/string.c:1.445.2.14.2.67
--- php-src/ext/standard/string.c:1.445.2.14.2.66       Mon Jul 30 14:22:06 2007
+++ php-src/ext/standard/string.c       Sun Aug  5 14:47:42 2007
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.66 2007/07/30 14:22:06 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.67 2007/08/05 14:47:42 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -2168,6 +2168,7 @@
        }
 
        if (argc > 3) {
+               SEPARATE_ZVAL(len);
                if (Z_TYPE_PP(len) != IS_ARRAY) {
                        convert_to_long_ex(len);
                        l = Z_LVAL_PP(len);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.877&r2=1.2027.2.547.2.878&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.877 php-src/NEWS:1.2027.2.547.2.878
--- php-src/NEWS:1.2027.2.547.2.877     Sat Aug  4 07:53:00 2007
+++ php-src/NEWS        Sun Aug  5 14:47:42 2007
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Aug 2007, PHP 5.2.4
+- Fixed bug #42208 (substr_replace() crashes when the same array is passed 
+  more than once). (crrodriguez at suse dot de, Ilia)
 - Fixed bug #36492 (Userfilters can leak buckets). (Sara)
 
 02 Aug 2007, PHP 5.2.4RC1

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug42208.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/strings/bug42208.phpt
+++ php-src/ext/standard/tests/strings/bug42208.phpt

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

Reply via email to