From 0a81dc026c4e727e9498654d703730ef8efbb8de Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Sat, 24 Sep 2011 00:29:46 -0700 Subject: [PATCH] Fix bug in gzgets() for a concatenated empty gzip stream. --- gzread.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gzread.c b/gzread.c index d44f2f7..695d01d 100644 --- a/gzread.c +++ b/gzread.c @@ -569,14 +569,14 @@ char * ZEXPORT gzgets(file, buf, len) left = (unsigned)len - 1; if (left) do { /* assure that something is in the output buffer */ - if (state->have == 0) { + while (state->have == 0 && (state->strm.avail_in || !state->eof)) { if (gz_make(state) == -1) return NULL; /* error */ - if (state->have == 0) { /* end of file */ - if (buf == str) /* got bupkus */ - return NULL; - break; /* got something -- return it */ - } + } + if (state->have == 0) { /* end of file */ + if (buf == str) /* got bupkus */ + return NULL; + break; /* got something -- return it */ } /* look for end-of-line in current output buffer */