diff options
| author | Stanislav Malyshev <stas@php.net> | 2011-01-30 22:28:57 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2011-01-30 22:28:57 +0000 |
| commit | 4a2b458835beb22df12e4398e1b4aa06e4716a8a (patch) | |
| tree | f5553284e618f628f9293f0aa30603d597e58434 | |
| parent | 6e57a7792e8143fdf659f597b05e777541afc31f (diff) | |
| download | php-git-4a2b458835beb22df12e4398e1b4aa06e4716a8a.tar.gz | |
fix bug 53885 (ZipArchive segfault with FL_UNCHANGED on empty archive)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/zip/lib/zip_name_locate.c | 4 | ||||
| -rw-r--r-- | ext/zip/tests/bug53885.phpt | 19 |
3 files changed, 25 insertions, 0 deletions
@@ -154,6 +154,8 @@ . Fixed bug #53603 (ZipArchive should quiet stat errors). (brad dot froehle at gmail dot com, Gustavo) . Fixed bug #53854 (Missing constants for compression type). (Richard, Adam) + . Fixed bug #53885 (ZipArchive segfault with FL_UNCHANGED on empty archive). + (Stas, Maksymilian Arciemowicz). 06 Jan 2011, PHP 5.3.5 - Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott, diff --git a/ext/zip/lib/zip_name_locate.c b/ext/zip/lib/zip_name_locate.c index e8b35ff936..96c4f937e0 100644 --- a/ext/zip/lib/zip_name_locate.c +++ b/ext/zip/lib/zip_name_locate.c @@ -60,6 +60,10 @@ _zip_name_locate(struct zip *za, const char *fname, int flags, return -1; } + if((flags & ZIP_FL_UNCHANGED) && !za->cdir) { + return -1; + } + cmp = (flags & ZIP_FL_NOCASE) ? strcmpi : strcmp; n = (flags & ZIP_FL_UNCHANGED) ? za->cdir->nentry : za->nentry; diff --git a/ext/zip/tests/bug53885.phpt b/ext/zip/tests/bug53885.phpt new file mode 100644 index 0000000000..d59bf8f034 --- /dev/null +++ b/ext/zip/tests/bug53885.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #53885 (ZipArchive segfault with FL_UNCHANGED on empty archive) +--SKIPIF-- +<?php +if(!extension_loaded('zip')) die('skip'); +?> +--FILE-- +<?php +$fname = dirname(__FILE__)."/test53885.zip"; +if(file_exists($fname)) unlink($fname); +touch($fname); +$nx=new ZipArchive(); +$nx->open($fname); +$nx->locateName("a",ZIPARCHIVE::FL_UNCHANGED); +$nx->statName("a",ZIPARCHIVE::FL_UNCHANGED); +?> +==DONE== +--EXPECTF-- +==DONE== |