X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7f975d7e1794cc35607f41dd0e718bf2f4e99314..f087591d5921b64f2c589ea9c608cfea61decd31:/client/fpga_compress.c?ds=sidebyside

diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 865681cd..c67f6769 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -77,7 +77,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
 	uint8_t *fpga_config;
 	uint32_t i;
 	int ret;
-	uint8_t c;		
+	int c;		
 	z_stream compressed_fpga_stream;
 
 	fpga_config = malloc(num_infiles * FPGA_CONFIG_SIZE);
@@ -91,6 +91,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
 			for(uint16_t j = 0; j < num_infiles; j++) {
 				fclose(infile[j]);
 			}
+			free(fpga_config);
 			return(EXIT_FAILURE);
 		}
 
@@ -98,7 +99,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
 			for(uint16_t k = 0; k < FPGA_INTERLEAVE_SIZE; k++) {
 				c = fgetc(infile[j]);
 				if (!feof(infile[j])) {
-					fpga_config[i++] = c;
+					fpga_config[i++] = c &0xFF;
 				} else if (num_infiles > 1) {
 					fpga_config[i++] = '\0';
 				}
@@ -112,6 +113,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
 	compressed_fpga_stream.avail_in = i;
 	compressed_fpga_stream.zalloc = fpga_deflate_malloc;
 	compressed_fpga_stream.zfree = fpga_deflate_free;
+	compressed_fpga_stream.opaque = Z_NULL;
 	
 	ret = deflateInit2(&compressed_fpga_stream, 
 						COMPRESS_LEVEL,
@@ -187,6 +189,7 @@ int zlib_decompress(FILE *infile, FILE *outfile)
 	compressed_fpga_stream.avail_out = DECOMPRESS_BUF_SIZE;
 	compressed_fpga_stream.zalloc = fpga_deflate_malloc;
 	compressed_fpga_stream.zfree = fpga_deflate_free;
+	compressed_fpga_stream.opaque = Z_NULL;
 	
 	ret = inflateInit2(&compressed_fpga_stream, 0);
 	
@@ -195,7 +198,7 @@ int zlib_decompress(FILE *infile, FILE *outfile)
 			compressed_fpga_stream.next_in = inbuf;
 			uint16_t i = 0;
 			do {
-				uint8_t c = fgetc(infile);
+				int c = fgetc(infile);
 				if (!feof(infile)) {
 					inbuf[i++] = c;
 					compressed_fpga_stream.avail_in++;