summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--main/main.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index eb1d2c4edd..bfa7ae5e55 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ PHP NEWS
- Core
. Fixed bug #78999 (Cycle leak when using function result as temporary).
(Dmitry)
+ . Fixed bug #71876 (Memory corruption htmlspecialchars(): charset `*' not
+ supported). (Nikita)
- CURL:
. Implemented FR #77711 (CURLFile should support UNICODE filenames). (cmb)
diff --git a/main/main.c b/main/main.c
index 6917fe3230..30629117d9 100644
--- a/main/main.c
+++ b/main/main.c
@@ -588,8 +588,8 @@ static PHP_INI_DISP(display_errors_mode)
*/
static PHP_INI_MH(OnUpdateDefaultCharset)
{
+ OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
if (new_value) {
- OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
#ifdef PHP_WIN32
php_win32_cp_do_update(ZSTR_VAL(new_value));
#endif
@@ -602,8 +602,8 @@ static PHP_INI_MH(OnUpdateDefaultCharset)
*/
static PHP_INI_MH(OnUpdateInternalEncoding)
{
+ OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
if (new_value) {
- OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
#ifdef PHP_WIN32
php_win32_cp_do_update(ZSTR_VAL(new_value));
#endif
@@ -616,8 +616,8 @@ static PHP_INI_MH(OnUpdateInternalEncoding)
*/
static PHP_INI_MH(OnUpdateInputEncoding)
{
+ OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
if (new_value) {
- OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
#ifdef PHP_WIN32
php_win32_cp_do_update(NULL);
#endif
@@ -630,8 +630,8 @@ static PHP_INI_MH(OnUpdateInputEncoding)
*/
static PHP_INI_MH(OnUpdateOutputEncoding)
{
+ OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
if (new_value) {
- OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
#ifdef PHP_WIN32
php_win32_cp_do_update(NULL);
#endif