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

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 69918c71996e921923620af6b0e3a94279bc36d3..174550cb4aacc342067a9b19fe762c0a83c0a8c0 100644 (file)
--- 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);
                        }
                }