cvs: php-src(PHP_5_1) /ext/pcre php_pcre.c

andrei Tue Apr 11 21:33:46 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/pcre php_pcre.c Log: MFH http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.8&r2=1.168.2.9&diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.168.2.8 php-src/ext/pcre/php_pcre.c:1.168.2.9 --- php-src/ext/pcre/php_pcre.c:1.168.2.8 Thu Apr 6 21:10:45 2006 +++ php-src/ext/pcre/php_pcre.c Tue Apr 11 21:33:46 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.168.2.8 2006/04/06 21:10:45 andrei Exp $ */ +/* $Id: php_pcre.c,v 1.168.2.9 2006/04/11 21:33:46 andrei Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -453,7 +453,7 @@ /* * 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); @@ -467,22 +467,34 @@ 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; } }