Try to fix ZTS build

diff --git a/Zend/zend.c b/Zend/zend.c
index f342a989a46ef6c94166a6c0afc856d0d0336b13..427db2a86151aa45e4ce28a63c1b93af0e6c60ee 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -655,9 +655,10 @@ static void compiler_globals_ctor(zend_compiler_globals *compiler_globals) /* {{
        compiler_globals->map_ptr_last = global_map_ptr_last;
        if (compiler_globals->map_ptr_last) {
                /* Allocate map_ptr table */
+               void *base;
                compiler_globals->map_ptr_size = ZEND_MM_ALIGNED_SIZE_EX(compiler_globals->map_ptr_last, 4096);
                base = pemalloc(compiler_globals->map_ptr_size * sizeof(void*), 1);
-               ZEND_MAP_PTR_SET_BASE(base);
+               ZEND_MAP_PTR_SET_REAL_BASE(compiler_globals->map_ptr_base, base);
                memset(base, 0, compiler_globals->map_ptr_last * sizeof(void*));
        }
 #else
@@ -914,7 +915,7 @@ int zend_startup(zend_utility_functions *utility_functions) /* {{{ */
                 */
                CG(map_ptr_size) = 1024 * 1024; // TODO: initial size ???
                CG(map_ptr_last) = 0;
-               ZEND_MAP_PTR_SET_BASE(pemalloc(CG(map_ptr_size) * sizeof(void*), 1));
+               ZEND_MAP_PTR_SET_REAL_BASE(CG(map_ptr_base), pemalloc(CG(map_ptr_size) * sizeof(void*), 1));
 # elif ZEND_MAP_PTR_KIND == ZEND_MAP_PTR_KIND_PTR_OR_OFFSET
                /* Map region is going to be created and resized at run-time. */
                ZEND_MAP_PTR_SET_REAL_BASE(CG(map_ptr_base), NULL);