com php-src: Merge branch 'PHP-5.6': ext/phar/phar_object.c

From: Date: Wed, 28 Jan 2015 16:02:03 +0000
Subject: com php-src: Merge branch 'PHP-5.6': ext/phar/phar_object.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-84414@lists.php.net to get a copy of this message
Commit: b7751630d1c50821146fc5732d05ede05ffdee5f Author: Xinchen Hui <laruence@php.net> Thu, 29 Jan 2015 00:02:03 +0800 Parents: 659395e3dd41cd6013d27b0bd13284f2fedd94d3 c06f1590a9c48ddd836f3b6cd127759154dca050 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b7751630d1c50821146fc5732d05ede05ffdee5f Log: Merge branch 'PHP-5.6' Conflicts: ext/phar/phar_object.c Changed paths: MM ext/phar/phar_object.c Diff: diff --cc ext/phar/phar_object.c index f58d125,e9a64f3..0b173d1 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@@ -2115,8 -2141,8 +2115,8 @@@ static zend_object *phar_rename_archive } its_ok: if (SUCCESS == php_stream_stat_path(newpath, &ssb)) { - efree(oldpath); - zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "phar \"%s\" exists and must be unlinked prior to conversion", newpath); + zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "phar \"%s\" exists and must be unlinked prior to conversion", newpath); + efree(oldpath); return NULL; } if (!phar->is_data) {

« previous php.cvs (#84414) next »