igzip: several fixes for issues reported by static code analysis

Signed-off-by: Tomasz Kantecki <[email protected]>

Author: tkanteck

igzip/checksum32_funcs_test.c

@@ -303,6 +303,8 @@ int update_over_mod_test(func_case_t * test_func)
 	unsigned char *buf = NULL;
 
 	buf = malloc(ADLER_MOD);
+	if (buf == NULL)
+		return 1;
 	memset(buf, 0xff, ADLER_MOD);
 
 	c_ref = c_dut = rand();

igzip/generate_custom_hufftables.c

@@ -361,6 +361,10 @@ int main(int argc, char *argv[])
 
 	if (argc > 3 && argv[1][0] == '-' && argv[1][1] == 'd') {
 		dict_file = fopen(argv[2], "r");
+		if (dict_file == NULL) {
+			printf("File \"%s\" open error!\n", argv[2]);
+			return 1;
+		}
 
 		fseek(dict_file, 0, SEEK_END);
 		dict_file_length = ftell(dict_file);
@@ -388,6 +392,10 @@ int main(int argc, char *argv[])
 
 	if ((argc > argi + 1) && argv[argi][0] == '-' && argv[argi][1] == 'h') {
 		hist_file = fopen(argv[argi + 1], "r+");
+		if (hist_file == NULL) {
+			printf("File \"%s\" open error!\n", argv[argi + 1]);
+			return 1;
+		}
 		fseek(hist_file, 0, SEEK_END);
 		hist_file_length = ftell(hist_file);
 		fseek(hist_file, 0, SEEK_SET);

igzip/igzip_build_hash_table_perf.c

@@ -5,6 +5,7 @@
 #include <getopt.h>
 #include "igzip_lib.h"
 #include "test.h"
+#include "huff_codes.h"
 
 #define DICT_LEN 32*1024
 
@@ -26,6 +27,7 @@ int main(int argc, char *argv[])
 	uint32_t dict_len = DICT_LEN;
 
 	stream.level = 0;
+	stream.internal_state.hash_mask = LVL0_HASH_MASK;
 	create_rand_data(dict, dict_len);
 
 	struct perf start;

igzip/igzip_inflate_test.c

@@ -74,10 +74,8 @@ int inflate_multi_pass(uint8_t * compress_buf, uint64_t compress_len,
 				comp_tmp_size = compress_len - comp_processed;
 
 			if (comp_tmp_size != 0) {
-				if (comp_tmp != NULL) {
+				if (comp_tmp != NULL)
 					free(comp_tmp);
-					comp_tmp = NULL;
-				}
 
 				comp_tmp = malloc(comp_tmp_size);
 
@@ -113,7 +111,6 @@ int inflate_multi_pass(uint8_t * compress_buf, uint64_t compress_len,
 				if (uncomp_tmp != NULL) {
 					fflush(0);
 					free(uncomp_tmp);
-					uncomp_tmp = NULL;
 				}
 
 				uncomp_tmp = malloc(uncomp_tmp_size);
@@ -275,7 +272,9 @@ int main(int argc, char **argv)
 			exit(0);
 		}
 
-		uncompressed_length = fread(uncompressed_stream, 1, file_length, file);
+		uncompressed_length =
+		    (uncompressed_stream == NULL) ? 0 : fread(uncompressed_stream, 1,
+							      file_length, file);
 		uncompressed_test_stream_length = uncompressed_length;
 		ret =
 		    test(compressed_stream, &compressed_length, uncompressed_stream,

igzip/igzip_perf.c

@@ -475,13 +475,19 @@ int isal_deflate_dict_perf(uint8_t * outbuf, uint64_t * outbuf_size, uint8_t * i
 	}
 
 	stream.level = level;
-	isal_deflate_process_dict(&stream, &dict_str, dict_buf, dict_file_size);
+	if (isal_deflate_process_dict(&stream, &dict_str, dict_buf, dict_file_size) != COMP_OK) {
+		if (level_buf != NULL)
+			free(level_buf);
+		return 1;
+	}
 
 	BENCHMARK(start, time, check =
 		  isal_deflate_dict_round(&stream, outbuf, *outbuf_size, inbuf,
 					  inbuf_size, level, level_buf,
 					  level_size_buf[level], flush_type, hist_bits,
 					  &dict_str));
+	if (level_buf != NULL)
+		free(level_buf);
 	*outbuf_size = stream.total_out;
 	return check;
 }
@@ -879,8 +885,13 @@ int main(int argc, char *argv[])
 		printf("\n");
 
 		if (outfile != NULL && i + 1 == compression_queue_size) {
-			FILE *out;
-			out = fopen(outfile, "wb");
+			FILE *out = fopen(outfile, "wb");
+
+			if (out == NULL) {
+				fprintf(stderr, "Could not write to the output file \"%s\"\n",
+					outfile);
+				exit(0);
+			}
 			fwrite(compressbuf, 1, info.deflate_size, out);
 			fclose(out);
 		}