diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-05-16 19:32:59 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-05-16 19:32:59 +0800 |
| commit | c667bb94fa7e1ca52bfaea2b372794f96269e03a (patch) | |
| tree | b1d612052d74e221a3db0d1b0f2addbbbac44660 | |
| parent | 7d418430fdfe893eae11cf3c1843d2f5b0574068 (diff) | |
| parent | 8a1713e39cf31f5c13839c8a6aeb784e365e1cd1 (diff) | |
| download | php-git-c667bb94fa7e1ca52bfaea2b372794f96269e03a.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)
| -rw-r--r-- | main/php_ini.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 55a083b18c..12dba2a52e 100644 --- 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 (!strncasecmp(Z_STRVAL_P(arg1), "PATH", sizeof("PATH") - 1)) { + if (zend_string_equals_literal_ci(Z_STR_P(arg1), "PATH")) { 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 (!strncasecmp(Z_STRVAL_P(arg1), "HOST", sizeof("HOST") - 1)) { + } else if (zend_string_equals_literal_ci(Z_STR_P(arg1), "HOST")) { key = Z_STRVAL_P(arg1); key = key + sizeof("HOST") - 1; key_len = Z_STRLEN_P(arg1) - sizeof("HOST") + 1; |