]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 28 Feb 2020 11:49:45 +0000 (12:49 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 28 Feb 2020 11:49:45 +0000 (12:49 +0100)
* PHP-7.4:
  Fixed bug #79252

1  2 
ext/opcache/ZendAccelerator.c

index 938f524ff5fdebeeba849deef33a18a828b00cfd,0c8722418c7f8494538408bf3193948b210bb75a..7aaaa6d0302f6da07e7af72c0180535322f7a12a
@@@ -4303,9 -4233,11 +4303,12 @@@ static void preload_load(void
                EG(persistent_classes_count)   = EG(class_table)->nNumUsed;
        }
        if (CG(map_ptr_last) != ZCSG(map_ptr_last)) {
+               size_t old_map_ptr_last = CG(map_ptr_last);
                CG(map_ptr_last) = ZCSG(map_ptr_last);
                CG(map_ptr_size) = ZEND_MM_ALIGNED_SIZE_EX(CG(map_ptr_last) + 1, 4096);
 -              CG(map_ptr_base) = perealloc(CG(map_ptr_base), CG(map_ptr_size) * sizeof(void*), 1);
 -              memset(CG(map_ptr_base) + old_map_ptr_last, 0, (CG(map_ptr_last) - old_map_ptr_last) * sizeof(void *));
 +              ZEND_MAP_PTR_SET_REAL_BASE(CG(map_ptr_base), perealloc(ZEND_MAP_PTR_REAL_BASE(CG(map_ptr_base)), CG(map_ptr_size) * sizeof(void*), 1));
++              memset(ZEND_MAP_PTR_REAL_BASE(CG(map_ptr_base)) + old_map_ptr_last, 0,
++                      (CG(map_ptr_last) - old_map_ptr_last) * sizeof(void *));
        }
  }