From 41bda78bd245ad7bdad2ca2feb71d5260fb487a8 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 24 Aug 2007 12:13:30 +0000 Subject: [PATCH] fix segfault on shutdown due to UG(utf8_conv) being destroyed twice --- ext/pcre/php_pcre.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index c0257a748b6..44bb9c36af4 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1034,6 +1034,7 @@ static int preg_do_eval(char *eval_str, int eval_str_len, char *subject, /* 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 */ }