Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: oops, 5.4 and 5.5 use malloc in TSRM
12 years ago · a3f09eb323
1 changed files with 2 additions and 2 deletions
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@ -231,7 +231,7 @@ PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper,

 	if (php_check_open_basedir(path_copy TSRMLS_CC)) {
 #ifdef VIRTUAL_DIR
-        efree(path_copy);
+		efree(path_copy);
 #endif
 		return NULL;
 	}
@ -243,7 +243,7 @@ PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper,
 		*opened_path = estrdup(path_copy);
 	}
 #ifdef VIRTUAL_DIR
-    efree(path_copy);
+	efree(path_copy);
 #endif
 	path_copy = NULL;