mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid possible NULL pointer dereference

Browse source 
This makes the code more robust in case the Uemis returns random or
non-sensical data. It's unlikely the user has a billion dives or that the
Uemis returns such a number. That's no reason not to handle this case
without crashing.

Coverity CID 1325289

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-10-01 21:49:00 -04:00
parent dd58402ef3
commit df51171352
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
uemis-downloader.c
View file

@ -840,11 +840,17 @@ static bool process_raw_buffer(device_data_t *devdata, uint32_t deviceid, char *
* at the time it's being read the *dive varible is not set because * at the time it's being read the *dive varible is not set because
* the dive_no tag comes before the object_id in the uemis ans file * the dive_no tag comes before the object_id in the uemis ans file
*/ */
dive_no[0] = '\0';
char *dive_no_buf = strdup(inbuf); char *dive_no_buf = strdup(inbuf);
char *dive_no_ptr = strstr(dive_no_buf, "dive_no{int{") + 12; char *dive_no_ptr = strstr(dive_no_buf, "dive_no{int{") + 12;
char *dive_no_end = strstr(dive_no_ptr, "{"); if (dive_no_ptr) {
*dive_no_end = 0; char *dive_no_end = strstr(dive_no_ptr, "{");
strcpy(dive_no, dive_no_ptr); if (dive_no_end) {
*dive_no_end = '\0';
strncpy(dive_no, dive_no_ptr, 9);
dive_no[9] = '\0';
}
}
free(dive_no_buf); free(dive_no_buf);
} }
while (!done) { while (!done) {