From: Xinchen Hui <laruence@php.net>
Date: Wed, 28 Jan 2015 16:02:03 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_REMOVALS~21^2~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7751630d1c50821146fc5732d05ede05ffdee5f;p=php

Merge branch 'PHP-5.6'

Conflicts:
	ext/phar/phar_object.c
---

b7751630d1c50821146fc5732d05ede05ffdee5f
diff --cc ext/phar/phar_object.c
index f58d125cf2,e9a64f39c9..0b173d1e0b
--- 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) {