diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-07-04 21:01:50 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-07-07 10:15:41 -0700 |
| commit | 00f177a5edb7f2578f75091fdf6fb1a1c8d994a2 (patch) | |
| tree | 1e9c3f7656a6fbf0d4691176d55dc964765add20 | |
| parent | 5df893ce3c6630fc77337ab0d78097eab1002bc1 (diff) | |
| download | php-git-00f177a5edb7f2578f75091fdf6fb1a1c8d994a2.tar.gz | |
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
| -rw-r--r-- | ext/phar/phar_object.c | 4 | ||||
| -rw-r--r-- | ext/phar/tests/bug69958.phpt | 14 | ||||
| -rw-r--r-- | ext/phar/tests/bug69958.tar | bin | 0 -> 513 bytes |
3 files changed, 17 insertions, 1 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 0c7f97105a..ebb15f047a 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -2296,7 +2296,9 @@ no_copy: zend_hash_destroy(&(phar->manifest)); zend_hash_destroy(&(phar->mounted_dirs)); zend_hash_destroy(&(phar->virtual_dirs)); - php_stream_close(phar->fp); + if (phar->fp) { + php_stream_close(phar->fp); + } efree(phar->fname); efree(phar); return NULL; diff --git a/ext/phar/tests/bug69958.phpt b/ext/phar/tests/bug69958.phpt new file mode 100644 index 0000000000..d63b413c29 --- /dev/null +++ b/ext/phar/tests/bug69958.phpt @@ -0,0 +1,14 @@ +--TEST-- +Phar: bug #69958: Segfault in Phar::convertToData on invalid file +--SKIPIF-- +<?php if (!extension_loaded("phar")) die("skip"); ?> +--FILE-- +<?php +$tarphar = new PharData(__DIR__.'/bug69958.tar'); +$phar = $tarphar->convertToData(Phar::TAR); +--EXPECTF-- +Fatal error: Uncaught exception 'BadMethodCallException' with message 'phar "%s/bug69958.tar" exists and must be unlinked prior to conversion' in %s/bug69958.php:%d +Stack trace: +#0 %s/bug69958.php(%d): PharData->convertToData(%d) +#1 {main} + thrown in %s/bug69958.php on line %d diff --git a/ext/phar/tests/bug69958.tar b/ext/phar/tests/bug69958.tar Binary files differnew file mode 100644 index 0000000000..02275248bd --- /dev/null +++ b/ext/phar/tests/bug69958.tar |