mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid ignoring file read errors

Browse source 
This fixes a bunch of Coverity warnings.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-10-03 10:02:55 -04:00
parent 58fbee7150
commit 08db242e0e
2 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
datatrak.h
View file

@ -13,22 +13,26 @@ typedef struct dtrakheader_ {
#define read_bytes(_n) \
switch (_n) { \
case 1: \
fread (&lector_bytes, sizeof(char), _n, archivo); \
if (fread (&lector_bytes, sizeof(char), _n, archivo) != _n) \
goto bail; \
tmp_1byte = lector_bytes[0]; \
break; \
case 2: \
fread (&lector_bytes, sizeof(char), _n, archivo); \
if (fread (&lector_bytes, sizeof(char), _n, archivo) != _n) \
goto bail; \
tmp_2bytes = two_bytes_to_int (lector_bytes[1], lector_bytes[0]); \
break; \
default: \
fread (&lector_word, sizeof(char), _n, archivo); \
if (fread (&lector_word, sizeof(char), _n, archivo) != _n) \
goto bail; \
tmp_4bytes = four_bytes_to_long(lector_word[3], lector_word[2], lector_word[1], lector_word[0]); \
break; \
}
#define read_string(_property) \
unsigned char *_property##tmp = (unsigned char *)calloc(tmp_1byte + 1, 1); \
fread((char *)_property##tmp, 1, tmp_1byte, archivo); \
if (fread((char *)_property##tmp, 1, tmp_1byte, archivo) != tmp_1byte) \
goto bail; \
_property = (unsigned char *)strcat(to_utf8(_property##tmp), ""); \
free(_property##tmp);