Fix compile warnings for

gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2) Signed-off-by: Eberhard S. Amann <[email protected]>
ibm-genwqe · Jan 8, 2018 · c01eeaf · c01eeaf
1 parent 389c8e4
commit c01eeaf
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
diff --git a/misc/zpipe.c b/misc/zpipe.c
@@ -126,7 +126,8 @@ static int inf(FILE *source, FILE *dest)
             assert(ret != Z_STREAM_ERROR);  /* state not clobbered */
             switch (ret) {
             case Z_NEED_DICT:
-                ret = Z_DATA_ERROR;     /* and fall through */
+                (void)inflateEnd(&strm);
+                return Z_DATA_ERROR;
             case Z_DATA_ERROR:
             case Z_MEM_ERROR:
                 (void)inflateEnd(&strm);

diff --git a/misc/zpipe_append.c b/misc/zpipe_append.c
@@ -279,7 +279,10 @@ static int inf(FILE *source, FILE *dest, int window_bits, int _flush,
 
 			switch (ret) {
 			case Z_NEED_DICT:
-				ret = Z_DATA_ERROR;	/* and fall through */
+				(void)inflateEnd(&strm);
+				free(in);
+				free(out);
+				return Z_DATA_ERROR;
 			case Z_DATA_ERROR:
 			case Z_MEM_ERROR:
 				(void)inflateEnd(&strm);

diff --git a/misc/zpipe_mt.c b/misc/zpipe_mt.c
@@ -370,7 +370,12 @@ static int inf(struct thread_data *d, FILE *source, FILE *dest,
 			/* assert(ret != Z_STREAM_ERROR); *//* not clobbered */
 			switch (ret) {
 			case Z_NEED_DICT:
-				ret = Z_DATA_ERROR;	/* and fall through */
+				(void)inflateEnd(&strm);
+				if (!pre_alloc_memory) {
+					__free(in);
+					__free(out);
+				}
+				return Z_DATA_ERROR;
 			case Z_STREAM_ERROR:
 			case Z_DATA_ERROR:
 			case Z_MEM_ERROR:

diff --git a/misc/zpipe_rnd.c b/misc/zpipe_rnd.c
@@ -232,6 +232,10 @@ static int inf(FILE *source, FILE *dest, int windowBits,
 					}
 					goto try_again;	/* try again */
 				}
+				(void)inflateEnd(&strm);
+				free(in);
+				free(out);
+				return ret;
 			case Z_DATA_ERROR: /* and fall through */
 			case Z_MEM_ERROR:
 				(void)inflateEnd(&strm);

diff --git a/tools/genwqe_gzip.c b/tools/genwqe_gzip.c
@@ -227,7 +227,7 @@ static int inf(FILE *source, FILE *dest, z_stream *strm,
 				break;
 			case Z_NEED_DICT:
 				fprintf(stderr, "NEED Dict........\n");
-				ret = Z_DATA_ERROR;	/* and fall through */
+				return Z_DATA_ERROR;
 			case Z_DATA_ERROR:
 			case Z_MEM_ERROR:
 				fprintf(stderr, "Fault..... %d\n", ret);

diff --git a/tools/zlib_mt_perf.c b/tools/zlib_mt_perf.c
@@ -367,7 +367,10 @@ static int infl(struct thread_data *d, FILE *source)
 			/* assert(ret != Z_STREAM_ERROR); *//* not clobbered */
 			switch (ret) {
 			case Z_NEED_DICT:
-				ret = Z_DATA_ERROR;	/* and fall through */
+				(void)inflateEnd(&strm);
+				__free(in);
+				__free(out);
+				return Z_DATA_ERROR;
 			case Z_STREAM_ERROR:
 			case Z_DATA_ERROR:
 			case Z_MEM_ERROR: