Disallowed numeric named captures.

diff --git a/ext/pcre/TODO b/ext/pcre/TODO
index 2dcac59ef4b0bf8104c6aee52503538ef3539dd4..68a7959c8d96fffd3408b93b5dad1953e36c3919 100644 (file)
--- a/ext/pcre/TODO
+++ b/ext/pcre/TODO
@@ -32,6 +32,4 @@
   of a grep function in PHP would be that the default is PREG_GREP_REKEY_NUMS
   or PREG_GREP_REKEY_ALL....
 
-- Disallow numeric named captures.
-
 

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 01a0f5dcd4d5a7b08f40ec863ff4e3a23acc629c..cf8928ddb886749b82a157db6ad5cea09a809a9e 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -464,7 +464,7 @@ static void php_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global)
 
        /*
         * Build a mapping from subpattern numbers to their names. We will always
-        * allocate the table, even though they may be no named subpatterns. This
+        * allocate the table, even though there may be no named subpatterns. This
         * avoids somewhat more complicated logic in the inner loops.
         */
        subpat_names = (char **)safe_emalloc(num_subpats, sizeof(char *), 0);
@@ -478,22 +478,34 @@ static void php_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global)
                if (rc < 0) {
                        php_error(E_WARNING, "%s: internal pcre_fullinfo() error %d",
                                          get_active_function_name(TSRMLS_C), rc);
+                       efree(offsets);
+                       efree(subpat_names);
                        RETURN_FALSE;
                }
                if (name_cnt > 0) {
                        int rc1, rc2;
+                       long dummy_l;
+                       double dummy_d;
                        rc1 = pcre_fullinfo(re, extra, PCRE_INFO_NAMETABLE, &name_table);
                        rc2 = pcre_fullinfo(re, extra, PCRE_INFO_NAMEENTRYSIZE, &name_size);
                        rc = rc2 ? rc2 : rc1;
                        if (rc < 0) {
                                php_error(E_WARNING, "%s: internal pcre_fullinfo() error %d",
                                                  get_active_function_name(TSRMLS_C), rc);
+                               efree(offsets);
+                               efree(subpat_names);
                                RETURN_FALSE;
                        }
 
                        while (ni++ < name_cnt) {
                                name_idx = 0xff * name_table[0] + name_table[1];
                                subpat_names[name_idx] = name_table + 2;
+                               if (is_numeric_string(subpat_names[name_idx], strlen(subpat_names[name_idx]), &dummy_l, &dummy_d, 0) > 0) {
+                                       php_error(E_WARNING, "%s: numeric named subpatterns are not allowed", get_active_function_name(TSRMLS_C));
+                                       efree(offsets);
+                                       efree(subpat_names);
+                                       RETURN_FALSE;
+                               }
                                name_table += name_size;
                        }
                }