com php-src: Fix bug #69958 - Segfault in Phar::convertToData on invalid file: ext/phar/phar_object.c ext/phar/tests/bug699 58.phpt
ext/phar/tests/bug69958.tar

From: Date: Tue, 07 Jul 2015 17:15:41 +0000
Subject: com php-src: Fix bug #69958 - Segfault in Phar::convertToData on invalid file: ext/phar/phar_object.c ext/phar/tests/bug699 58.phpt
ext/phar/tests/bug69958.tar
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87820@lists.php.net to get a copy of this message
Commit: 00f177a5edb7f2578f75091fdf6fb1a1c8d994a2 Author: Stanislav Malyshev <stas@php.net> Sat, 4 Jul 2015 21:01:50 -0700 Parents: 5df893ce3c6630fc77337ab0d78097eab1002bc1 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=00f177a5edb7f2578f75091fdf6fb1a1c8d994a2 Log: Fix bug #69958 - Segfault in Phar::convertToData on invalid file Bugs: https://bugs.php.net/69958 Changed paths: M ext/phar/phar_object.c A ext/phar/tests/bug69958.phpt A ext/phar/tests/bug69958.tar Diff: diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 0c7f971..ebb15f0 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 0000000..d63b413 --- /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 new file mode 100644 index 0000000..0227524 Binary files /dev/null and b/ext/phar/tests/bug69958.tar differ

« previous php.cvs (#87820) next »