Merge branch 'pull-request/2120' into PHP-5.6

ksmiley · Sep 24, 2016 · c596b02 · c596b02
2 parents 8f5eda4 + 5880428
commit c596b02
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -2735,9 +2735,9 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
 		alloc_globals->mm_heap = malloc(sizeof(struct _zend_mm_heap));
 		memset(alloc_globals->mm_heap, 0, sizeof(struct _zend_mm_heap));
 		alloc_globals->mm_heap->use_zend_alloc = 0;
-		alloc_globals->mm_heap->_malloc = malloc;
+		alloc_globals->mm_heap->_malloc = __zend_malloc;
 		alloc_globals->mm_heap->_free = free;
-		alloc_globals->mm_heap->_realloc = realloc;
+		alloc_globals->mm_heap->_realloc = __zend_realloc;
 	} else {
 		alloc_globals->mm_heap = zend_mm_startup();
 	}