Initialize the offset table - PCRE may sometimes miss offsets

smalyshev · smalyshev · commit c351b47ce85a · 2014-11-03T11:31:02.000-08:00
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
@@ -640,7 +640,7 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, int subjec
 	}
 
 	offsets = (int *)safe_emalloc(size_offsets, sizeof(int), 0);
-
+	memset(offsets, 0, size_offsets*sizeof(int));
 	/* Allocate match sets array and initialize the values. */
 	if (global && subpats && subpats_order == PREG_PATTERN_ORDER) {
 		match_sets = (zval **)safe_emalloc(num_subpats, sizeof(zval *), 0);

Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,7 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry pce, char subject, int subjec`
`640`	`640`	`}`
`641`	`641`
`642`	`642`	`offsets = (int *)safe_emalloc(size_offsets, sizeof(int), 0);`
`643`		`-`
	`643`	`+ memset(offsets, 0, size_offsets*sizeof(int));`
`644`	`644`	`/* Allocate match sets array and initialize the values. */`
`645`	`645`	`if (global && subpats && subpats_order == PREG_PATTERN_ORDER) {`
`646`	`646`	`match_sets = (zval *)safe_emalloc(num_subpats, sizeof(zval ), 0);`