From 850a198ff1879e506c961c91da30009539ed14b3 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Tue, 13 Dec 2011 22:25:59 -0800 Subject: [PATCH] Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF. Z_BUF_ERROR was also being used for an unsuccessful gzungetc and for buffer lengths that didn't fit in an int. Those uses were changed to Z_DATA_ERROR in order to assure that Z_BUF_ERROR occurs only when a premature end of input occurs, indicating that gzclearerr() can be used. --- gzread.c | 4 ++-- gzwrite.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gzread.c b/gzread.c index 1e97e38..4bbbf52 100644 --- a/gzread.c +++ b/gzread.c @@ -302,7 +302,7 @@ int ZEXPORT gzread(file, buf, len) /* since an int is returned, make sure len fits in one, otherwise return with an error (this avoids the flaw in the interface) */ if ((int)len < 0) { - gz_error(state, Z_BUF_ERROR, "requested length does not fit in int"); + gz_error(state, Z_DATA_ERROR, "requested length does not fit in int"); return -1; } @@ -445,7 +445,7 @@ int ZEXPORT gzungetc(c, file) /* if no room, give up (must have already done a gzungetc()) */ if (state->x.have == (state->size << 1)) { - gz_error(state, Z_BUF_ERROR, "out of room to push characters"); + gz_error(state, Z_DATA_ERROR, "out of room to push characters"); return -1; } diff --git a/gzwrite.c b/gzwrite.c index 2dcb3fc..18ade4a 100644 --- a/gzwrite.c +++ b/gzwrite.c @@ -185,7 +185,7 @@ int ZEXPORT gzwrite(file, buf, len) /* since an int is returned, make sure len fits in one, otherwise return with an error (this avoids the flaw in the interface) */ if ((int)len < 0) { - gz_error(state, Z_BUF_ERROR, "requested length does not fit in int"); + gz_error(state, Z_DATA_ERROR, "requested length does not fit in int"); return 0; }