github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

check return value from zlib inflateInit2...

Browse source
This commit is contained in:
iceman1001 2019-04-08 08:08:47 +02:00
commit a89ae9cb35
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
armsrc/fpgaloader.c
View file

@ -229,8 +229,10 @@ static bool reset_fpga_stream(int bitstream_version, z_streamp compressed_fpga_s
compressed_fpga_stream->zalloc = &fpga_inflate_malloc; compressed_fpga_stream->zalloc = &fpga_inflate_malloc;
compressed_fpga_stream->zfree = &fpga_inflate_free; compressed_fpga_stream->zfree = &fpga_inflate_free;
inflateInit2(compressed_fpga_stream, 0); int res = inflateInit2(compressed_fpga_stream, 0);
if ( res < 0 )
return false;
fpga_image_ptr = output_buffer; fpga_image_ptr = output_buffer;
for (uint16_t i = 0; i < FPGA_BITSTREAM_FIXED_HEADER_SIZE; i++) for (uint16_t i = 0; i < FPGA_BITSTREAM_FIXED_HEADER_SIZE; i++)

4
armsrc/start.c
View file

@ -48,7 +48,9 @@ static void uncompress_data_section(void) {
data_section.opaque = NULL; data_section.opaque = NULL;
// initialize zlib for inflate // initialize zlib for inflate
inflateInit2(&data_section, 15); int res = inflateInit2(&data_section, 15);
if ( res < 0 )
return;
// uncompress data segment to RAM // uncompress data segment to RAM
inflate(&data_section, Z_FINISH); inflate(&data_section, Z_FINISH);

4
client/fpga_compress.c
View file

@ -206,7 +206,9 @@ int zlib_decompress(FILE *infile, FILE *outfile) {
compressed_fpga_stream.opaque = Z_NULL; compressed_fpga_stream.opaque = Z_NULL;
ret = inflateInit2(&compressed_fpga_stream, 0); ret = inflateInit2(&compressed_fpga_stream, 0);
if ( res < 0 )
return (EXIT_FAILURE);
do { do {
if (compressed_fpga_stream.avail_in == 0) { if (compressed_fpga_stream.avail_in == 0) {
compressed_fpga_stream.next_in = inbuf; compressed_fpga_stream.next_in = inbuf;