From d600b923ee26399f86e63e6e1a6d90ddaeb571d6 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 15 Jul 2017 17:08:10 -0700 Subject: [PATCH] zip-reader: Fix memory leak on error path in zip_reader_create(). --- src/libpspp/zip-reader.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/libpspp/zip-reader.c b/src/libpspp/zip-reader.c index 92a67649fd..0f8c263328 100644 --- a/src/libpspp/zip-reader.c +++ b/src/libpspp/zip-reader.c @@ -354,14 +354,19 @@ zip_reader_create (const char *filename, struct string *errs) return NULL; } - if (! get_u16 (zr->fr, &disknum)) return NULL; - if (! get_u16 (zr->fr, &disknum)) return NULL; + if (! get_u16 (zr->fr, &disknum) + || ! get_u16 (zr->fr, &disknum) - if (! get_u16 (zr->fr, &zr->n_members)) return NULL; - if (! get_u16 (zr->fr, &total_members)) return NULL; + || ! get_u16 (zr->fr, &zr->n_members) + || ! get_u16 (zr->fr, &total_members) - if (! get_u32 (zr->fr, ¢ral_dir_length)) return NULL; - if (! get_u32 (zr->fr, ¢ral_dir_start)) return NULL; + || ! get_u32 (zr->fr, ¢ral_dir_length) + || ! get_u32 (zr->fr, ¢ral_dir_start)) + { + fclose (zr->fr); + free (zr); + return NULL; + } if ( 0 != fseeko (zr->fr, central_dir_start, SEEK_SET)) { -- 2.30.2