From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 28 Feb 2020 11:49:45 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=519a72e0b499d1b623f22f235aa3704282fbf79f;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79252
---

519a72e0b499d1b623f22f235aa3704282fbf79f
diff --cc ext/opcache/ZendAccelerator.c
index 938f524ff5,0c8722418c..7aaaa6d030
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -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 *));
  	}
  }