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

Cleanup: avoid dereferencing NULL pointer

Browse source 
Coverity CID 208330
Coverity CID 208301

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-12-27 22:11:00 -08:00
parent e8719413a7
commit 6cc5b601aa
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/file.c
View file

@ -927,6 +927,11 @@ int parse_dan_format(const char *filename, char **params, int pnr)
++iter; ++iter;
} }
if (!iter) {
fprintf(stderr, "DEBUG: Data corrupt");
return -1;
}
/* Setting date */ /* Setting date */
memcpy(tmpbuf, iter, 8); memcpy(tmpbuf, iter, 8);
tmpbuf[8] = 0; tmpbuf[8] = 0;
@ -950,9 +955,12 @@ int parse_dan_format(const char *filename, char **params, int pnr)
} }
if (ptr) if (ptr)
ptr = strstr(ptr, NL); ptr = strstr(ptr, NL);
if (ptr) if (ptr) {
ptr += strlen(NL); ptr += strlen(NL);
} else {
fprintf(stderr, "DEBUG: Data corrupt");
return -1;
}
end_ptr = ptr - (char *)mem.buffer; end_ptr = ptr - (char *)mem.buffer;
/* Copy the current dive data to start of mem_csv buffer */ /* Copy the current dive data to start of mem_csv buffer */