From: Michael Wallner <mike@php.net>
Date: Sat, 9 Sep 2006 12:10:28 +0000 (+0000)
Subject: - fix crash when unicode.sematics are enabled and unicode.output_encoding doesn't... 
X-Git-Tag: RELEASE_1_0_0RC1~1725
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83eac101c3a80eebeaf34799d46c9f12738e3f20;p=php

- fix crash when unicode.sematics are enabled and unicode.output_encoding doesn't match iconv.internal_encoding
---

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 69918c7199..174550cb4a 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -343,8 +343,7 @@ static int php_iconv_output_handler(void **nothing, php_output_context *output_c
 			output_encoding = INI_STR("unicode.output_encoding");
 			if (output_encoding && *output_encoding && ucnv_compareNames(output_encoding, ICONVG(internal_encoding))) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "unicode.output_encoding differs from iconv.internal_encoding (%s, %s)", output_encoding, ICONVG(internal_encoding));
-				efree(ICONVG(input_encoding));
-				ICONVG(input_encoding) = estrdup(output_encoding);
+				zend_alter_ini_entry(ZEND_STRS("iconv.internal_encoding"), output_encoding, strlen(output_encoding), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
 			}
 		}