MFH

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index ed5f4bc8cf3142e6a3fa97b21934d3a76c2d2452..06490d4dd47b31b60973b2cd643eb4bc9f059aea 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -687,6 +687,9 @@ static PHP_INI_MH(OnUpdate_mbstring_script_encoding)
 /* {{{ static PHP_INI_MH(OnUpdate_mbstring_substitute_character) */
 static PHP_INI_MH(OnUpdate_mbstring_substitute_character)
 {
+       int c;
+       char *endptr = NULL;
+
        if (new_value != NULL) {
                if (strcasecmp("none", new_value) == 0) {
                        MBSTRG(filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE;
@@ -694,7 +697,12 @@ static PHP_INI_MH(OnUpdate_mbstring_substitute_character)
                        MBSTRG(filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_LONG;
                } else {
                        MBSTRG(filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
-                       MBSTRG(filter_illegal_substchar) = zend_atoi(new_value, new_value_length);
+                       if (new_value_length >0) {
+                               c = strtol(new_value, &endptr, 0);
+                               if (*endptr == '\0') {
+                                       MBSTRG(filter_illegal_substchar) = c;
+                               }
+                       }
                }
        }