tony2001 Fri Aug 24 12:13:31 2007 UTC
Modified files:
/php-src/ext/pcre php_pcre.c
Log:
fix segfault on shutdown due to UG(utf8_conv) being destroyed twice
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.217&r2=1.218&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.217 php-src/ext/pcre/php_pcre.c:1.218
--- php-src/ext/pcre/php_pcre.c:1.217 Tue Jul 24 22:34:17 2007
+++ php-src/ext/pcre/php_pcre.c Fri Aug 24 12:13:30 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.217 2007/07/24 22:34:17 tony2001 Exp $ */
+/* $Id: php_pcre.c,v 1.218 2007/08/24 12:13:30 tony2001 Exp $ */
/* TODO
* php_pcre_replace_impl():
@@ -1034,6 +1034,7 @@
/* Run the code */
if (zend_eval_string(code.c, &retval, compiled_string_description
TSRMLS_CC) == FAILURE) {
efree(compiled_string_description);
+ UG(runtime_encoding_conv) = orig_runtime_conv;
php_error_docref(NULL TSRMLS_CC,E_ERROR, "Failed evaluating
code: %s%s", PHP_EOL, code.c);
/* zend_error() does not return in this case */
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
