fix memory leak

smalyshev · smalyshev · commit fa1f24867a5f · 2009-07-17T00:57:46.000Z
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
@@ -316,8 +316,11 @@ ZEND_API int zend_restore_ini_entry(char *name, uint name_length, int stage) /*
 	}
 
 	if (EG(modified_ini_directives)) {
-		zend_restore_ini_entry_cb(ini_entry, stage TSRMLS_CC);
-		zend_hash_del(EG(modified_ini_directives), name, name_length);
+		if(zend_restore_ini_entry_cb(ini_entry, stage TSRMLS_CC) == 0) {
+			zend_hash_del(EG(modified_ini_directives), name, name_length);
+		} else {
+			return FAILURE;
+		}
 	}
 
 	return SUCCESS;

Original file line number	Diff line number	Diff line change
`@@ -316,8 +316,11 @@ ZEND_API int zend_restore_ini_entry(char name, uint name_length, int stage) /`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`if (EG(modified_ini_directives)) {`
`319`		`- zend_restore_ini_entry_cb(ini_entry, stage TSRMLS_CC);`
`320`		`- zend_hash_del(EG(modified_ini_directives), name, name_length);`
	`319`	`+ if(zend_restore_ini_entry_cb(ini_entry, stage TSRMLS_CC) == 0) {`
	`320`	`+ zend_hash_del(EG(modified_ini_directives), name, name_length);`
	`321`	`+ } else {`
	`322`	`+ return FAILURE;`
	`323`	`+ }`
`321`	`324`	`}`
`322`	`325`
`323`	`326`	`return SUCCESS;`