com php-src: Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata(): ext/phar/tar.c ext/ph ar/tests/bug71391.phpt ext/phar/tests/bug71
391.tar

From: Date: Sun, 17 Jan 2016 04:43:43 +0000
Subject: com php-src: Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata(): ext/phar/tar.c ext/ph ar/tests/bug71391.phpt ext/phar/tests/bug71
391.tar
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90864@lists.php.net to get a copy of this message
Commit: 1c1b8b69982375700d4b011eb89ea48b66dbd5aa Author: Stanislav Malyshev <stas@php.net> Sat, 16 Jan 2016 20:43:43 -0800 Parents: 285cd3417fb61597345b829f5f573707bbdcd484 Branches: PHP-5.5 PHP-5.5.32 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1c1b8b69982375700d4b011eb89ea48b66dbd5aa Log: Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata() Bugs: https://bugs.php.net/71391 Changed paths: M ext/phar/tar.c A ext/phar/tests/bug71391.phpt A ext/phar/tests/bug71391.tar Diff: diff --git a/ext/phar/tar.c b/ext/phar/tar.c index 34ef0ef..5f26805 100644 --- a/ext/phar/tar.c +++ b/ext/phar/tar.c @@ -880,6 +880,9 @@ static int phar_tar_setupmetadata(void *pDest, void *argument TSRMLS_DC) /* {{{ if (entry->filename_len >= sizeof(".phar/.metadata") && !memcmp(entry->filename, ".phar/.metadata", sizeof(".phar/.metadata")-1)) { if (entry->filename_len == sizeof(".phar/.metadata.bin")-1 && !memcmp(entry->filename, ".phar/.metadata.bin", sizeof(".phar/.metadata.bin")-1)) { + if (entry->phar->metadata == NULL) { + return ZEND_HASH_APPLY_REMOVE; + } return phar_tar_setmetadata(entry->phar->metadata, entry, error TSRMLS_CC); } /* search for the file this metadata entry references */ diff --git a/ext/phar/tests/bug71391.phpt b/ext/phar/tests/bug71391.phpt new file mode 100644 index 0000000..b8d84f5 --- /dev/null +++ b/ext/phar/tests/bug71391.phpt @@ -0,0 +1,18 @@ +--TEST-- +Phar: bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata() +--SKIPIF-- +<?php if (!extension_loaded("phar")) die("skip"); ?> +--FILE-- +<?php +// duplicate since the tar will change +copy(__DIR__."/bug71391.tar", __DIR__."/bug71391.test.tar"); +$p = new PharData(__DIR__."/bug71391.test.tar"); +$p->delMetaData(); +?> +DONE +--CLEAN-- +<?php +unlink(__DIR__."/bug71391.test.tar"); +?> +--EXPECT-- +DONE \ No newline at end of file diff --git a/ext/phar/tests/bug71391.tar b/ext/phar/tests/bug71391.tar new file mode 100644 index 0000000..a5b155a Binary files /dev/null and b/ext/phar/tests/bug71391.tar differ

« previous php.cvs (#90864) next »