com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/bz2/bz2.c
| From: | Stanislav Malyshev | Date: | Thu, 08 May 2014 09:04:11 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/bz2/bz2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78205@lists.php.net to get a copy of this message | ||
Commit: a3f09eb323986fa8e8c4c6e398071eedc6add02e
Author: Stanislav Malyshev <stas@php.net> Thu, 8 May 2014 02:02:42 -0700
Parents: aa1a25e303220db8cf829d686cf9ed03a2225d6e cf2b9955d4c26393f6d16b71b5c2c69d8d2b7f52
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a3f09eb323986fa8e8c4c6e398071eedc6add02e
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
oops, 5.4 and 5.5 use malloc in TSRM
Changed paths:
MM ext/bz2/bz2.c
Diff:
diff --cc ext/bz2/bz2.c
index 93bcacc,84fcc00..f310289
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@@ -231,7 -230,7 +231,7 @@@ PHP_BZ2_API php_stream *_php_stream_bz2
if (php_check_open_basedir(path_copy TSRMLS_CC)) {
#ifdef VIRTUAL_DIR
- efree(path_copy);
- free(path_copy);
++ efree(path_copy);
#endif
return NULL;
}
@@@ -243,7 -242,7 +243,7 @@@
*opened_path = estrdup(path_copy);
}
#ifdef VIRTUAL_DIR
- efree(path_copy);
- free(path_copy);
++ efree(path_copy);
#endif
path_copy = NULL;