Merge branch 'PHP-5.5'

felipensp · felipensp · commit 0ca4b6c08314 · 2013-10-12T17:25:37.000-03:00
* PHP-5.5:
  - Fixed resource leak
diff --git a/ext/opcache/zend_accelerator_blacklist.c b/ext/opcache/zend_accelerator_blacklist.c
@@ -314,6 +314,7 @@ void zend_accel_blacklist_load(zend_blacklist *blacklist, char *filename)
 		blacklist->entries[blacklist->pos].path = (char *)malloc(path_length + 1);
 		if (!blacklist->entries[blacklist->pos].path) {
 			zend_accel_error(ACCEL_LOG_ERROR, "malloc() failed\n");
+			fclose(fp);
 			return;
 		}
 		blacklist->entries[blacklist->pos].id = blacklist->pos;

Original file line number	Diff line number	Diff line change
`@@ -314,6 +314,7 @@ void zend_accel_blacklist_load(zend_blacklist blacklist, char filename)`
`314`	`314`	`blacklist->entries[blacklist->pos].path = (char *)malloc(path_length + 1);`
`315`	`315`	`if (!blacklist->entries[blacklist->pos].path) {`
`316`	`316`	`zend_accel_error(ACCEL_LOG_ERROR, "malloc() failed\n");`
	`317`	`+ fclose(fp);`
`317`	`318`	`return;`
`318`	`319`	`}`
`319`	`320`	`blacklist->entries[blacklist->pos].id = blacklist->pos;`