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: correctly prevent memory leak

Browse source 
The previous attempt to fix this in commit 652e382e68 ("Cleanup: avoid a
few memory leaks") was clearly bogus. Oops.

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

15
core/ostctools.c
View file

@ -62,7 +62,7 @@ void ostctools_import(const char *file, struct dive_table *divetable)
report_error(failed_to_read_msg, file); report_error(failed_to_read_msg, file);
free(uc_tmp); free(uc_tmp);
free(ostcdive); free(ostcdive);
goto out; goto close_out;
} }
ostcdive->number = uc_tmp[0] + (uc_tmp[1] << 8); ostcdive->number = uc_tmp[0] + (uc_tmp[1] << 8);
free(uc_tmp); free(uc_tmp);
@ -74,7 +74,7 @@ void ostctools_import(const char *file, struct dive_table *divetable)
report_error(failed_to_read_msg, file); report_error(failed_to_read_msg, file);
free(uc_tmp); free(uc_tmp);
free(ostcdive); free(ostcdive);
goto out; goto close_out;
} }
serial = uc_tmp[0] + (uc_tmp[1] << 8); serial = uc_tmp[0] + (uc_tmp[1] << 8);
free(uc_tmp); free(uc_tmp);
@ -90,7 +90,7 @@ void ostctools_import(const char *file, struct dive_table *divetable)
if (ferror(archive)) { if (ferror(archive)) {
report_error(failed_to_read_msg, file); report_error(failed_to_read_msg, file);
free(ostcdive); free(ostcdive);
goto out; goto close_out;
} }
// Try to determine the dc family based on the header type // Try to determine the dc family based on the header type
@ -108,8 +108,7 @@ void ostctools_import(const char *file, struct dive_table *divetable)
default: default:
report_error(translate("gettextFromC", "Unknown DC in dive %d"), ostcdive->number); report_error(translate("gettextFromC", "Unknown DC in dive %d"), ostcdive->number);
free(ostcdive); free(ostcdive);
fclose(archive); goto close_out;
goto out;
} }
} }
@ -140,8 +139,7 @@ void ostctools_import(const char *file, struct dive_table *divetable)
if (ret == 0) { if (ret == 0) {
report_error(translate("gettextFromC", "Unknown DC in dive %d"), ostcdive->number); report_error(translate("gettextFromC", "Unknown DC in dive %d"), ostcdive->number);
free(ostcdive); free(ostcdive);
fclose(archive); goto close_out;
goto out;
} }
tmp = calloc(strlen(devdata->vendor) + strlen(devdata->model) + 28, 1); tmp = calloc(strlen(devdata->vendor) + strlen(devdata->model) + 28, 1);
sprintf(tmp, "%s %s (Imported from OSTCTools)", devdata->vendor, devdata->model); sprintf(tmp, "%s %s (Imported from OSTCTools)", devdata->vendor, devdata->model);
@ -175,9 +173,10 @@ void ostctools_import(const char *file, struct dive_table *divetable)
record_dive_to_table(ostcdive, divetable); record_dive_to_table(ostcdive, divetable);
mark_divelist_changed(true); mark_divelist_changed(true);
sort_table(divetable); sort_table(divetable);
close_out:
fclose(archive); fclose(archive);
out: out:
free(archive);
free(devdata); free(devdata);
free(buffer); free(buffer);
} }