From 00f177a5edb7f2578f75091fdf6fb1a1c8d994a2 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sat, 4 Jul 2015 21:01:50 -0700 Subject: [PATCH] Fix bug #69958 - Segfault in Phar::convertToData on invalid file --- ext/phar/phar_object.c | 4 +++- ext/phar/tests/bug69958.phpt | 14 ++++++++++++++ ext/phar/tests/bug69958.tar | Bin 0 -> 513 bytes 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 ext/phar/tests/bug69958.phpt create mode 100644 ext/phar/tests/bug69958.tar 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-- + +--FILE-- +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 new file mode 100644 index 0000000000000000000000000000000000000000..02275248bd08524f937a67e851f02ee38148e7f0 GIT binary patch literal 513 NcmZQz7zHCb1ONg700961 literal 0 HcmV?d00001 -- 2.50.1