Use emalloc instead of malloc

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index b7e7cd3bbbf43c7faf7817cce6762abe1da701d4..28f98249d2a27b09614b2acb47b74a878df65e40 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -4077,14 +4077,14 @@ static void zend_do_traits_method_binding(zend_class_entry *ce TSRMLS_DC) /* {{{
        size_t i;
 
        /* prepare copies of trait function tables for combination */
-       function_tables = malloc(sizeof(HashTable*) * ce->num_traits);
-       resulting_table = (HashTable *) malloc(sizeof(HashTable));
+       function_tables = emalloc(sizeof(HashTable*) * ce->num_traits);
+       resulting_table = (HashTable *)emalloc(sizeof(HashTable));
        
        /* TODO: revisit this start size, may be its not optimal */
-       zend_hash_init_ex(resulting_table, 10, NULL, NULL, 1, 0);
+       zend_hash_init_ex(resulting_table, 10, NULL, NULL, 0, 0);
   
        for (i = 0; i < ce->num_traits; i++) {
-               function_tables[i] = (HashTable *) malloc(sizeof(HashTable));
+               function_tables[i] = (HashTable *)emalloc(sizeof(HashTable));
                zend_hash_init_ex(function_tables[i], ce->traits[i]->function_table.nNumOfElements, NULL, NULL, 1, 0);
 
                if (ce->trait_precedences) {
@@ -4117,14 +4117,14 @@ static void zend_do_traits_method_binding(zend_class_entry *ce TSRMLS_DC) /* {{{
        for (i = 0; i < ce->num_traits; i++) {
                /* zend_hash_destroy(function_tables[i]); */
                zend_hash_graceful_destroy(function_tables[i]);
-               free(function_tables[i]);
+               efree(function_tables[i]);
        }
-       free(function_tables);
+       efree(function_tables);
 
        /* free temporary resulting table */
        /* zend_hash_destroy(resulting_table); */
        zend_hash_graceful_destroy(resulting_table);
-       free(resulting_table);
+       efree(resulting_table);
 }
 /* }}} */