From f9804a9b6a766f17cf4b16862bf5f96dd4ee0ac1 Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Fri, 10 Apr 2009 15:48:22 +0000 Subject: [PATCH] MFB: fix #47662 --- ext/pcre/php_pcre.c | 2 +- ext/pcre/tests/bug47662.phpt | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 ext/pcre/tests/bug47662.phpt diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index ec7a225c7e..cc06bd86df 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -220,7 +220,7 @@ static char **make_subpats_table(int num_subpats, pcre_cache_entry *pce TSRMLS_D } while (ni++ < name_cnt) { - name_idx = 0xff * name_table[0] + name_table[1]; + name_idx = 0xff * (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 TSRMLS_CC, E_WARNING, "Numeric named subpatterns are not allowed"); diff --git a/ext/pcre/tests/bug47662.phpt b/ext/pcre/tests/bug47662.phpt new file mode 100644 index 0000000000..d6056746cb --- /dev/null +++ b/ext/pcre/tests/bug47662.phpt @@ -0,0 +1,18 @@ +--TEST-- +Bug #47662 (support more than 127 named subpatterns) +--FILE-- +))'; +} +$regex .= 'fo+bar@'; + +var_dump(preg_match($regex, 'foobar')); +echo "Done!\n"; + +?> +--EXPECT-- +int(1) +Done! -- 2.40.0