update to zlib-1.21 (we already have the CAN-2004-0797 security fixes)

"in it goes" deraadt@, in the near-total absence of feedback from others

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/libz/gzio.c b/lib/libz/gzio.c
index 632c76617b0..36b554cc16f 100644
--- a/lib/libz/gzio.c
+++ b/lib/libz/gzio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gzio.c,v 1.12 2003/12/16 22:33:02 henning Exp $	*/
+/*	$OpenBSD: gzio.c,v 1.13 2004/12/03 03:06:36 djm Exp $	*/
 /* gzio.c -- IO on .gz files
  * Copyright (C) 1995-2003 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
@@ -457,6 +457,10 @@ int ZEXPORT gzread (file, buf, len)
                     s->z_err = Z_ERRNO;
                     break;
                 }
+                if (feof(s->file)) {        /* avoid error for empty file */
+                    s->z_err = Z_STREAM_END;
+                    break;
+                }
             }
             s->stream.next_in = s->inbuf;
         }