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 memory leak

Browse source 
Coverity CID 45121
Coverity CID 45163

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-12-27 17:14:43 -08:00
parent d3118bedd4
commit ecd8580de9
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/datatrak.c
View file

@ -204,6 +204,7 @@ unsigned char *dt_dive_parser(unsigned char *runner, struct dive *dt_dive)
if (dt_dive->dive_site_uuid == 0) if (dt_dive->dive_site_uuid == 0)
dt_dive->dive_site_uuid = create_dive_site(buffer, dt_dive->when); dt_dive->dive_site_uuid = create_dive_site(buffer, dt_dive->when);
free(locality); free(locality);
locality = NULL;
free(dive_point); free(dive_point);
/* /*
@ -471,9 +472,9 @@ unsigned char *dt_dive_parser(unsigned char *runner, struct dive *dt_dive)
dt_dive->notes = calloc((len +1), 1); dt_dive->notes = calloc((len +1), 1);
dt_dive->notes = memcpy(dt_dive->notes, buffer, len); dt_dive->notes = memcpy(dt_dive->notes, buffer, len);
free(tmp_string1); free(tmp_string1);
if (tmp_notes_str != NULL)
free(tmp_notes_str);
} }
if (tmp_notes_str != NULL)
free(tmp_notes_str);
/* /*
* Alarms 1 and Alarms2 - Bit tables - Not in Subsurface, we use the profile * Alarms 1 and Alarms2 - Bit tables - Not in Subsurface, we use the profile
@ -565,6 +566,7 @@ unsigned char *dt_dive_parser(unsigned char *runner, struct dive *dt_dive)
free(devdata); free(devdata);
return membuf; return membuf;
bail: bail:
free(locality);
free(devdata); free(devdata);
return NULL; return NULL;
} }