com php-src: Fix bug #66660: use str_efree instead of e free to handle interned empty strings correctly: NEWS Zend/tests/bug66660.phpt Zend/zend_hi
ghlight.c

Commit: 20036525e2b5ee7613a6d3ead0270631b23f6a15 Author: Ferenc Kovacs <tyrael@php.net> Sun, 13 Apr 2014 10:45:46 +0200 Parents: 7fd9898a2d00d3df95d581df0fe67d91ced86661 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=20036525e2b5ee7613a6d3ead0270631b23f6a15 Log: Fix bug #66660: use str_efree instead of efree to handle interned empty strings correctly Bugs: https://bugs.php.net/66660 Changed paths: M NEWS A Zend/tests/bug66660.phpt M Zend/zend_highlight.c Diff: diff --git a/NEWS b/NEWS index e98d823..cd75dca 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,7 @@ PHP NEWS to complete the set; now possible thanks to bug #66015 being fixed. (Bob) . Fixed bug #66568 (Update reflection information for unserialize() function). (Ferenc) + . Fixed bug #66660 (Composer.phar install/update fails). (Ferenc) - mysqlnd: . Added a new fetching mode to mysqlnd. (Andrey) diff --git a/Zend/tests/bug66660.phpt b/Zend/tests/bug66660.phpt new file mode 100644 index 0000000..9ae8a27 --- /dev/null +++ b/Zend/tests/bug66660.phpt @@ -0,0 +1,13 @@ +--TEST-- +Bug #66660 (Composer.phar install/update fails) +--STDIN-- +<?php __CLASS__ ?> +--FILE-- +<?php +file_put_contents(__DIR__."/bug66660.tmp.php", "<?php __CLASS__ ?>"); +echo php_strip_whitespace(__DIR__."/bug66660.tmp.php"); +?> +--CLEAN-- +<?php unlink(__DIR__."/bug66660.tmp.php"); ?> +--EXPECT-- +<?php __CLASS__ ?> diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c index e4f8d02..68f2b7b 100644 --- a/Zend/zend_highlight.c +++ b/Zend/zend_highlight.c @@ -211,7 +211,7 @@ ZEND_API void zend_strip(TSRMLS_D) break; default: - efree(token.value.str.val); + STR_FREE(token.value.str.val); break; } }