Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix minor memory leak of CG(script_encoding_list)
This commit is contained in:
Christoph M. Becker 2020-07-22 20:34:21 +02:00
commit f1436c4832

View file

@ -1105,6 +1105,11 @@ void zend_shutdown(void) /* {{{ */
ZEND_MAP_PTR_SET_REAL_BASE(CG(map_ptr_base), NULL);
CG(map_ptr_size) = 0;
}
if (CG(script_encoding_list)) {
free(CG(script_encoding_list));
CG(script_encoding_list) = NULL;
CG(script_encoding_list_size) = 0;
}
#endif
zend_destroy_rsrc_list_dtors();
}