Merge branch 'PHP-7.4'

cmb69 · cmb69 · commit f1436c4832bc · 2020-07-22T20:34:21.000+02:00
* PHP-7.4:
  Fix minor memory leak of CG(script_encoding_list)
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -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();
 }

Original file line number	Diff line number	Diff line change
`@@ -1105,6 +1105,11 @@ void zend_shutdown(void) /* {{{ */`
`1105`	`1105`	`ZEND_MAP_PTR_SET_REAL_BASE(CG(map_ptr_base), NULL);`
`1106`	`1106`	`CG(map_ptr_size) = 0;`
`1107`	`1107`	`}`
	`1108`	`+ if (CG(script_encoding_list)) {`
	`1109`	`+ free(CG(script_encoding_list));`
	`1110`	`+ CG(script_encoding_list) = NULL;`
	`1111`	`+ CG(script_encoding_list_size) = 0;`
	`1112`	`+ }`
`1108`	`1113`	`#endif`
`1109`	`1114`	`zend_destroy_rsrc_list_dtors();`
`1110`	`1115`	`}`