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

Fix memory leak when parsing a dive fails

Browse source 
We had all these repetitive calls to dc_parser_destroy but didn't free the
already allocated dive.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-03-06 15:36:46 -08:00
parent b51dd0a84b
commit 8ab1fa3983
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
libdivecomputer.c
View file

@ -407,8 +407,7 @@ static int dive_cb(const unsigned char *data, unsigned int size,
rc = dc_parser_set_data(parser, data, size); rc = dc_parser_set_data(parser, data, size);
if (rc != DC_STATUS_SUCCESS) { if (rc != DC_STATUS_SUCCESS) {
dev_info(devdata, translate("gettextFromC", "Error registering the data")); dev_info(devdata, translate("gettextFromC", "Error registering the data"));
dc_parser_destroy(parser); goto error_exit;
return false;
} }
import_dive_number++; import_dive_number++;
@ -416,8 +415,7 @@ static int dive_cb(const unsigned char *data, unsigned int size,
rc = dc_parser_get_datetime(parser, &dt); rc = dc_parser_get_datetime(parser, &dt);
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) { if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
dev_info(devdata, translate("gettextFromC", "Error parsing the datetime")); dev_info(devdata, translate("gettextFromC", "Error parsing the datetime"));
dc_parser_destroy(parser); goto error_exit;
return false;
} }
dive->dc.model = strdup(devdata->model); dive->dc.model = strdup(devdata->model);
dive->dc.deviceid = devdata->deviceid; dive->dc.deviceid = devdata->deviceid;
@ -438,8 +436,7 @@ static int dive_cb(const unsigned char *data, unsigned int size,
rc = dc_parser_get_field(parser, DC_FIELD_DIVETIME, 0, &divetime); rc = dc_parser_get_field(parser, DC_FIELD_DIVETIME, 0, &divetime);
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) { if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
dev_info(devdata, translate("gettextFromC", "Error parsing the divetime")); dev_info(devdata, translate("gettextFromC", "Error parsing the divetime"));
dc_parser_destroy(parser); goto error_exit;
return false;
} }
dive->dc.duration.seconds = divetime; dive->dc.duration.seconds = divetime;
@ -448,8 +445,7 @@ static int dive_cb(const unsigned char *data, unsigned int size,
rc = dc_parser_get_field(parser, DC_FIELD_MAXDEPTH, 0, &maxdepth); rc = dc_parser_get_field(parser, DC_FIELD_MAXDEPTH, 0, &maxdepth);
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) { if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
dev_info(devdata, translate("gettextFromC", "Error parsing the maxdepth")); dev_info(devdata, translate("gettextFromC", "Error parsing the maxdepth"));
dc_parser_destroy(parser); goto error_exit;
return false;
} }
dive->dc.maxdepth.mm = rint(maxdepth * 1000); dive->dc.maxdepth.mm = rint(maxdepth * 1000);
@ -458,8 +454,7 @@ static int dive_cb(const unsigned char *data, unsigned int size,
rc = dc_parser_get_field(parser, DC_FIELD_GASMIX_COUNT, 0, &ngases); rc = dc_parser_get_field(parser, DC_FIELD_GASMIX_COUNT, 0, &ngases);
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) { if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
dev_info(devdata, translate("gettextFromC", "Error parsing the gas mix count")); dev_info(devdata, translate("gettextFromC", "Error parsing the gas mix count"));
dc_parser_destroy(parser); goto error_exit;
return false;
} }
#if DC_VERSION_CHECK(0, 3, 0) #if DC_VERSION_CHECK(0, 3, 0)
@ -471,8 +466,7 @@ static int dive_cb(const unsigned char *data, unsigned int size,
rc = dc_parser_get_field(parser, DC_FIELD_SALINITY, 0, &salinity); rc = dc_parser_get_field(parser, DC_FIELD_SALINITY, 0, &salinity);
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) { if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
dev_info(devdata, translate("gettextFromC", "Error obtaining water salinity")); dev_info(devdata, translate("gettextFromC", "Error obtaining water salinity"));
dc_parser_destroy(parser); goto error_exit;
return false;
} }
dive->dc.salinity = rint(salinity.density * 10.0); dive->dc.salinity = rint(salinity.density * 10.0);
@ -480,8 +474,7 @@ static int dive_cb(const unsigned char *data, unsigned int size,
rc = dc_parser_get_field(parser, DC_FIELD_ATMOSPHERIC, 0, &surface_pressure); rc = dc_parser_get_field(parser, DC_FIELD_ATMOSPHERIC, 0, &surface_pressure);
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) { if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
dev_info(devdata, translate("gettextFromC", "Error obtaining surface pressure")); dev_info(devdata, translate("gettextFromC", "Error obtaining surface pressure"));
dc_parser_destroy(parser); goto error_exit;
return false;
} }
dive->dc.surface_pressure.mbar = rint(surface_pressure * 1000.0); dive->dc.surface_pressure.mbar = rint(surface_pressure * 1000.0);
#endif #endif
@ -489,23 +482,21 @@ static int dive_cb(const unsigned char *data, unsigned int size,
rc = parse_gasmixes(devdata, dive, parser, ngases, data); rc = parse_gasmixes(devdata, dive, parser, ngases, data);
if (rc != DC_STATUS_SUCCESS) { if (rc != DC_STATUS_SUCCESS) {
dev_info(devdata, translate("gettextFromC", "Error parsing the gas mix")); dev_info(devdata, translate("gettextFromC", "Error parsing the gas mix"));
dc_parser_destroy(parser); goto error_exit;
return false;
} }
// Initialize the sample data. // Initialize the sample data.
rc = parse_samples(devdata, &dive->dc, parser); rc = parse_samples(devdata, &dive->dc, parser);
if (rc != DC_STATUS_SUCCESS) { if (rc != DC_STATUS_SUCCESS) {
dev_info(devdata, translate("gettextFromC", "Error parsing the samples")); dev_info(devdata, translate("gettextFromC", "Error parsing the samples"));
dc_parser_destroy(parser); goto error_exit;
return false;
} }
dc_parser_destroy(parser);
/* If we already saw this dive, abort. */ /* If we already saw this dive, abort. */
if (!devdata->force_download && find_dive(&dive->dc)) if (!devdata->force_download && find_dive(&dive->dc))
return false; goto error_exit;
dc_parser_destroy(parser);
/* Various libdivecomputer interface fixups */ /* Various libdivecomputer interface fixups */
if (first_temp_is_air && dive->dc.samples) { if (first_temp_is_air && dive->dc.samples) {
@ -517,6 +508,12 @@ static int dive_cb(const unsigned char *data, unsigned int size,
record_dive(dive); record_dive(dive);
mark_divelist_changed(true); mark_divelist_changed(true);
return true; return true;
error_exit:
dc_parser_destroy(parser);
free(dive);
return false;
} }
/* /*