Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function)
This commit is contained in:
Xinchen Hui 2016-09-01 12:10:54 +08:00
commit 5f3a26c741

View File

@ -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;