cvs: php-src(PHP_5_2) /ext/pcre php_pcre.c

scottmac Mon Jun 8 21:52:08 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pcre php_pcre.c Log: MFH 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.31&r2=1.168.2.9.2.32&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.31 php-src/ext/pcre/php_pcre.c:1.168.2.9.2.32 --- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.31 Tue Apr 14 20:31:31 2009 +++ php-src/ext/pcre/php_pcre.c Mon Jun 8 21:52:08 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.168.2.9.2.31 2009/04/14 20:31:31 nlopess Exp $ */ +/* $Id: php_pcre.c,v 1.168.2.9.2.32 2009/06/08 21:52:08 scottmac Exp $ */ #include "php.h" #include "php_ini.h" @@ -842,8 +842,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; }