From: Rasmus Lerdorf <rasmus@php.net>
Date: Mon, 6 Feb 2012 18:18:53 +0000 (+0000)
Subject: Safer way to call pcre_fullinfo - bug 60986
X-Git-Tag: php-5.4.0RC8~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=090bb97555a9ddfb3d94f5fcf2901f7b158c1d16;p=php

Safer way to call pcre_fullinfo - bug 60986
---

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index fc96ef6bef..c9d707280c 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -241,6 +241,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(char *regex, int regex_le
 	char				*pattern;
 	int					 do_study = 0;
 	int					 poptions = 0;
+	int				count = 0;
 	unsigned const char *tables = NULL;
 #if HAVE_SETLOCALE
 	char				*locale = setlocale(LC_CTYPE, NULL);
@@ -255,7 +256,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(char *regex, int regex_le
 		 * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
 		 * is, we flush it and compile the pattern from scratch.
 		 */
-		if (pcre_fullinfo(pce->re, NULL, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
+		if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
 			zend_hash_clean(&PCRE_G(pcre_cache));
 		} else {
 #if HAVE_SETLOCALE