Fix read after efree()

jani · Apr 10, 2012 · 6b00f23 · 6b00f23
1 parent 13620d2
commit 6b00f23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Changelog b/Changelog
@@ -1,5 +1,6 @@
 2012-02-12 - 0.9.34
 
+    - Fix read after efree() that lets function_exists() malfunction
     - Fix build with clang compiler
     - Added a request variable drop statistic log message
 

diff --git a/execute.c b/execute.c
@@ -1109,8 +1109,6 @@ static int ih_function_exists(IH_HANDLER_PARAMS)
 
 	retval = (zend_hash_find(EG(function_table), lcname, func_name_len+1, (void **)&func) == SUCCESS);
 
-	efree(lcname);
-
 	/*
 	 * A bit of a hack, but not a bad one: we see if the handler of the function
 	 * is actually one that displays "function is disabled" message.
@@ -1143,6 +1141,8 @@ static int ih_function_exists(IH_HANDLER_PARAMS)
 		}
 	}
 
+	efree(lcname);
+
 	RETVAL_BOOL(retval);
 	return (1);
 }