com php-src: Fixed incorrect efree(): ext/phar/phar_object. c

From: Date: Mon, 19 May 2014 12:19:01 +0000
Subject: com php-src: Fixed incorrect efree(): ext/phar/phar_object. c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78466@lists.php.net to get a copy of this message
Commit: 78e4f03c22de421832b5e20520543660f716f3af Author: Dmitry Stogov <dmitry@zend.com> Mon, 19 May 2014 16:19:01 +0400 Parents: a21e6d6ed94af1166c9b6d0a9d2d05f90b9c81ec Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=78e4f03c22de421832b5e20520543660f716f3af Log: Fixed incorrect efree() Changed paths: M ext/phar/phar_object.c Diff: diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index f723197..e8f9c4c 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:

« previous php.cvs (#78466) next »