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: leak fix in taxonomy_set_country()

Browse source 
When overwriting a country, the old string was not freed. Fix this.
Contains an unrelated coding-style fix: use braces if code block
contains more than one line.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-09-05 12:50:03 +02:00 • committed by Dirk Hohndel
parent b1a1dc3639
commit 86c24dd832
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/taxonomy.c
View file

@ -65,9 +65,10 @@ void copy_taxonomy(const struct taxonomy_data *orig, struct taxonomy_data *copy)
int taxonomy_index_for_category(const struct taxonomy_data *t, enum taxonomy_category cat) int taxonomy_index_for_category(const struct taxonomy_data *t, enum taxonomy_category cat)
{ {
for (int i = 0; i < t->nr; i++) for (int i = 0; i < t->nr; i++) {
if (t->category[i].category == cat) if (t->category[i].category == cat)
return i; return i;
}
return -1; return -1;
} }
@ -90,6 +91,8 @@ void taxonomy_set_country(struct taxonomy_data *t, const char *country, enum tax
for (int i = 0; i < t->nr; i++) { for (int i = 0; i < t->nr; i++) {
if (t->category[i].category == TC_COUNTRY) { if (t->category[i].category == TC_COUNTRY) {
free((void *)t->category[i].value);
t->category[i].value = NULL;
idx = i; idx = i;
break; break;
} }