From 4a2b458835beb22df12e4398e1b4aa06e4716a8a Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sun, 30 Jan 2011 22:28:57 +0000 Subject: fix bug 53885 (ZipArchive segfault with FL_UNCHANGED on empty archive) --- ext/zip/lib/zip_name_locate.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ext/zip/lib/zip_name_locate.c') 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; -- cgit v1.2.1