Fix memory leaks

Author: ircmaxell

Zend/zend_autoload.c

@@ -25,6 +25,7 @@
 #include "zend_types.h"
 #include "zend_exceptions.h"
 #include "zend_interfaces.h"
+#include "zend_string.h"
 
 #define HT_MOVE_TAIL_TO_HEAD(ht)                            \
     do {                                                        \
@@ -111,8 +112,11 @@ void* zend_autoload_call(zend_string *name, zend_string *lname, long type)
 static zend_string* zend_autoload_get_key(zend_fcall_info *fci)
 {
     switch (Z_TYPE(fci->function_name)) {
-        case IS_STRING:
-            return Z_STR(fci->function_name);
+        case IS_STRING: {
+            zend_string *ret = Z_STR(fci->function_name);
+            zend_string_addref(ret);
+            return ret;
+        }
         case IS_OBJECT: {
             char handle[16];
             sprintf(handle, "%lu", (unsigned long) Z_OBJ_HANDLE(fci->function_name));
@@ -133,8 +137,10 @@ int zend_autoload_register(zend_autoload_func* func, zend_bool prepend)
     }
 
     if (zend_hash_add_ptr(&EG(autoload.functions), key, func) == NULL) {
+        zend_string_release(key);
         return FAILURE;
     }
+    zend_string_release(key);
 
     if (prepend) {
         HT_MOVE_TAIL_TO_HEAD(&EG(autoload.functions));
@@ -150,9 +156,17 @@ int zend_autoload_unregister(zend_autoload_func* func)
 
     zend_hash_del(&EG(autoload.functions), key);
 
+    zend_string_release(key);
+
     return SUCCESS;
 }
 
+void zend_autoload_dtor(zval *pzv)
+{
+    zend_autoload_func *func = Z_PTR_P(pzv);
+    efree(func);
+}
+
 ZEND_FUNCTION(autoload_register)
 {
     zend_autoload_func *func;
@@ -170,6 +184,7 @@ ZEND_FUNCTION(autoload_register)
     }
 
     if (zend_autoload_register(func, prepend) == FAILURE) {
+        efree(func);
         RETURN_FALSE;
     }
     RETURN_TRUE;

Zend/zend_autoload.h

@@ -35,6 +35,7 @@ typedef struct {
 void* zend_autoload_call(zend_string *name, zend_string *lname, long type);
 int zend_autoload_register(zend_autoload_func* func, zend_bool prepend);
 int zend_autoload_unregister(zend_autoload_func* func);
+void zend_autoload_dtor(zval *pzv);
 
 #define ZEND_AUTOLOAD_CLASS     (1<<0)
 #define ZEND_AUTOLOAD_FUNCTION  (1<<1)

Zend/zend_constants.c

@@ -481,6 +481,10 @@ zend_constant *zend_quick_get_constant(const zval *key, zend_ulong flags)
 			}
 		}
 	}
+
+    if (c == NULL) {
+        c = (zend_constant*) zend_autoload_call(Z_STR_P(key), Z_STR_P(key), ZEND_AUTOLOAD_CONSTANT);
+    }
 	return c;
 }
 

Zend/zend_execute_API.c

@@ -151,10 +151,10 @@ void init_executor(void) /* {{{ */
 	EG(autoload_func) = NULL;
 	EG(error_handling) = EH_NORMAL;
 
-    ZEND_INIT_SYMTABLE(&EG(autoload.stack.class));
-    ZEND_INIT_SYMTABLE(&EG(autoload.stack.function));
-    ZEND_INIT_SYMTABLE(&EG(autoload.stack.constant));
-    ZEND_INIT_SYMTABLE(&EG(autoload.functions));
+    zend_hash_init(&EG(autoload.stack.class), 8, NULL, NULL, 0);
+    zend_hash_init(&EG(autoload.stack.function), 8, NULL, NULL, 0);
+    zend_hash_init(&EG(autoload.stack.constant), 8, NULL, NULL, 0);
+    zend_hash_init(&EG(autoload.functions), 8, NULL, zend_autoload_dtor, 0);
 
 	zend_vm_stack_init();
 
@@ -371,6 +371,10 @@ void shutdown_executor(void) /* {{{ */
 		zend_stack_destroy(&EG(user_error_handlers));
 		zend_stack_destroy(&EG(user_exception_handlers));
 		zend_objects_store_destroy(&EG(objects_store));
+        zend_hash_destroy(&EG(autoload.functions));
+        zend_hash_destroy(&EG(autoload.stack.class));
+        zend_hash_destroy(&EG(autoload.stack.function));
+        zend_hash_destroy(&EG(autoload.stack.constant));
 		if (EG(in_autoload)) {
 			zend_hash_destroy(EG(in_autoload));
 			FREE_HASHTABLE(EG(in_autoload));