summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmb@php.net>2016-07-27 19:05:43 +0200
committerChristoph M. Becker <cmb@php.net>2016-07-27 19:06:36 +0200
commit15f94e93e759c9a5e609bfd8dce316e4b5852a8b (patch)
treec88a435001433cec48426d48477198f368a98274 /ext/pcre/php_pcre.c
parentdfb3e270c2c0319c2e1bcaf53e0e0f9921d5cae2 (diff)
parent40afd77826e19023df3f095525956f713bf0d96f (diff)
downloadphp-git-15f94e93e759c9a5e609bfd8dce316e4b5852a8b.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/pcre/php_pcre.c')
-rw-r--r--ext/pcre/php_pcre.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index dbb9c6abec..4ba5b29772 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -261,7 +261,7 @@ static char **make_subpats_table(int num_subpats, pcre_cache_entry *pce)
subpat_names = (char **)ecalloc(num_subpats, sizeof(char *));
while (ni++ < name_cnt) {
- name_idx = 0xff * (unsigned char)name_table[0] + (unsigned char)name_table[1];
+ name_idx = 0x100 * (unsigned char)name_table[0] + (unsigned char)name_table[1];
subpat_names[name_idx] = name_table + 2;
if (is_numeric_string(subpat_names[name_idx], strlen(subpat_names[name_idx]), NULL, NULL, 0) > 0) {
php_error_docref(NULL, E_WARNING, "Numeric named subpatterns are not allowed");