Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: Fix memory leak in TSRM
12 years ago · 0c709cc2dc
1 changed files with 6 additions and 0 deletions
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@ -230,6 +230,9 @@ PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper,
 #endif  

 	if (php_check_open_basedir(path_copy TSRMLS_CC)) {
+#ifdef VIRTUAL_DIR
+        efree(path_copy);
+#endif
 		return NULL;
 	}
 	
@ -239,6 +242,9 @@ PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper,
 	if (opened_path && bz_file) {
 		*opened_path = estrdup(path_copy);
 	}
+#ifdef VIRTUAL_DIR
+    efree(path_copy);
+#endif
 	path_copy = NULL;
 	
 	if (bz_file == NULL) {