Fixed bug #74600

Make sure the hash entry is an array.

The origin fix broke support for HOST/PATH ini sections. Only the
beginning of the string has to match. Revert this check but use
zend_binary_strncasecmp instead of strncasecmp.

diff --git a/main/php_ini.c b/main/php_ini.c
index 7d09fbcfad206c7b3fb5ffc593b31585fad3436a..cf9711fd67f6e7b7e0d6ba33a7bca68d8c2f4b3e 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -280,7 +280,7 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t
                                size_t key_len;
 
                                /* PATH sections */
-                               if (zend_string_equals_literal_ci(Z_STR_P(arg1), "PATH")) {
+                               if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "PATH", sizeof("PATH") - 1, sizeof("PATH") - 1)) {
                                        key = Z_STRVAL_P(arg1);
                                        key = key + sizeof("PATH") - 1;
                                        key_len = Z_STRLEN_P(arg1) - sizeof("PATH") + 1;
@@ -291,7 +291,7 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t
                                        TRANSLATE_SLASHES_LOWER(key);
 
                                /* HOST sections */
-                               } else if (zend_string_equals_literal_ci(Z_STR_P(arg1), "HOST")) {
+                               } else if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "HOST", sizeof("HOST") - 1, sizeof("HOST") - 1)) {
                                        key = Z_STRVAL_P(arg1);
                                        key = key + sizeof("HOST") - 1;
                                        key_len = Z_STRLEN_P(arg1) - sizeof("HOST") + 1;
@@ -328,7 +328,9 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t
                                                zend_hash_init(Z_ARRVAL(section_arr), 8, NULL, (dtor_func_t) config_zval_dtor, 1);
                                                entry = zend_hash_str_update(target_hash, key, key_len, &section_arr);
                                        }
-                                       active_ini_hash = Z_ARRVAL_P(entry);
+                                       if (Z_TYPE_P(entry) == IS_ARRAY) {
+                                               active_ini_hash = Z_ARRVAL_P(entry);
+                                       }
                                }
                        }
                        break;