com php-src: oops, 5.4 and 5.5 use malloc in TSRM: ext/bz2/bz2.c
| From: | Stanislav Malyshev | Date: | Thu, 08 May 2014 08:59:39 +0000 |
| Subject: | com php-src: oops, 5.4 and 5.5 use malloc in TSRM: ext/bz2/bz2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78206@lists.php.net to get a copy of this message | ||
Commit: 4392339c3ec9dab6be0edf9f4373654993de6fa4
Author: Stanislav Malyshev <stas@php.net> Thu, 8 May 2014 01:59:39 -0700
Parents: 0cc18fdfbae82ab533d74e730bb89240fba535d4
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4392339c3ec9dab6be0edf9f4373654993de6fa4
Log:
oops, 5.4 and 5.5 use malloc in TSRM
Changed paths:
M ext/bz2/bz2.c
Diff:
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index 908a78d..84fcc00 100644
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -230,7 +230,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);
+ free(path_copy);
#endif
return NULL;
}
@@ -242,7 +242,7 @@ PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper,
*opened_path = estrdup(path_copy);
}
#ifdef VIRTUAL_DIR
- efree(path_copy);
+ free(path_copy);
#endif
path_copy = NULL;