summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-05-19 16:19:01 +0400
committerDmitry Stogov <dmitry@zend.com>2014-05-19 16:19:01 +0400
commit78e4f03c22de421832b5e20520543660f716f3af (patch)
treed4698c014b708ec79bf58ccba7eeaba8f6b6409a
parenta21e6d6ed94af1166c9b6d0a9d2d05f90b9c81ec (diff)
downloadphp-git-78e4f03c22de421832b5e20520543660f716f3af.tar.gz
Fixed incorrect efree()
-rw-r--r--ext/phar/phar_object.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index f723197527..e8f9c4c481 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -712,15 +712,8 @@ PHP_METHOD(Phar, webPhar)
switch (Z_TYPE(retval)) {
case IS_STRING:
efree(entry);
-
- if (fci.retval != &retval) {
- entry = estrndup(Z_STRVAL_P(fci.retval), Z_STRLEN_P(fci.retval));
- entry_len = Z_STRLEN_P(fci.retval);
- } else {
- entry = Z_STRVAL(retval);
- entry_len = Z_STRLEN(retval);
- }
-
+ entry = estrndup(Z_STRVAL_P(fci.retval), Z_STRLEN_P(fci.retval));
+ entry_len = Z_STRLEN_P(fci.retval);
break;
case IS_TRUE:
case IS_FALSE: