nlopess Sat Mar 8 13:01:59 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/pcre/tests bug44214.phpt bug44214_2.phpt
Modified files: /php-src/ext/pcre php_pcre.c Log: fix bug #44214: crash with preg_replace_callback and global variables http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.13&r2=1.168.2.9.2.21.2.14&diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.13 php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.14 --- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.13 Sat Mar 8 11:58:12 2008 +++ php-src/ext/pcre/php_pcre.c Sat Mar 8 13:01:58 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.13 2008/03/08 11:58:12 nlopess Exp $ */ +/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.14 2008/03/08 13:01:58 nlopess Exp $ */ #include "php.h" #include "php_ini.h" @@ -841,8 +841,8 @@ result_len = offsets[1] - offsets[0]; *result = estrndup(&subject[offsets[0]], result_len); } - zval_dtor(subpats); - FREE_ZVAL(subpats); + + zval_ptr_dtor(&subpats); return result_len; } http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug44214.phpt?view=markup&rev=1.1 Index: php-src/ext/pcre/tests/bug44214.phpt +++ php-src/ext/pcre/tests/bug44214.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug44214_2.phpt?view=markup&rev=1.1 Index: php-src/ext/pcre/tests/bug44214_2.phpt +++ php-src/ext/pcre/tests/bug44214_2.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php