Merge branch 'PHP-7.0' into PHP-7.1

laruence · laruence · commit 5f3a26c74130 · 2016-09-01T12:10:54.000+08:00
* PHP-7.0:
  Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function)
diff --git a/ext/opcache/zend_accelerator_blacklist.c b/ext/opcache/zend_accelerator_blacklist.c
@@ -178,7 +178,9 @@ static void zend_accel_blacklist_update_regexp(zend_blacklist *blacklist)
 			it->next = NULL;
 
 			if ((it->re = pcre_compile(regexp, PCRE_NO_AUTO_CAPTURE, &pcre_error, &pcre_error_offset, 0)) == NULL) {
+				free(it);
 				blacklist_report_regexp_error(pcre_error, pcre_error_offset);
+				return;
 			}
 			/* prepare for the next iteration */
 			p = regexp + 2;

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,9 @@ static void zend_accel_blacklist_update_regexp(zend_blacklist *blacklist)`
`178`	`178`	`it->next = NULL;`
`179`	`179`
`180`	`180`	`if ((it->re = pcre_compile(regexp, PCRE_NO_AUTO_CAPTURE, &pcre_error, &pcre_error_offset, 0)) == NULL) {`
	`181`	`+ free(it);`
`181`	`182`	`blacklist_report_regexp_error(pcre_error, pcre_error_offset);`
	`183`	`+ return;`
`182`	`184`	`}`
`183`	`185`	`/* prepare for the next iteration */`
`184`	`186`	`p = regexp + 2;`