tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] cleaning up memory in normalize_string_languages

Browse Source
This commit is contained in:
Al
2016-02-08 02:43:12 -05:00
parent afd5844f21
commit 0695738253
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/normalize.c
View File

@@ -114,10 +114,7 @@ string_tree_t *normalize_string_languages(char *str, uint64_t options, size_t nu
size_t consumed = 0; size_t consumed = 0;
char_array *array = char_array_new_size(len);
khash_t(int_set) *scripts = kh_init(int_set); khash_t(int_set) *scripts = kh_init(int_set);
char *utf8_normalized = NULL; char *utf8_normalized = NULL;
char *ptr = str; char *ptr = str;
@@ -140,6 +137,7 @@ string_tree_t *normalize_string_languages(char *str, uint64_t options, size_t nu
utf8_normalized = NULL; utf8_normalized = NULL;
} }
kh_destroy(int_set, scripts);
return tree; return tree;
} }
@@ -151,7 +149,7 @@ string_tree_t *normalize_string_languages(char *str, uint64_t options, size_t nu
if (ret < 0) { if (ret < 0) {
log_error("Error in kh_put\n"); log_error("Error in kh_put\n");
string_tree_destroy(tree); string_tree_destroy(tree);
char_array_destroy(array); kh_destroy(int_set, scripts);
return NULL; return NULL;
} }
} }
@@ -217,6 +215,8 @@ string_tree_t *normalize_string_languages(char *str, uint64_t options, size_t nu
} }
kh_destroy(int_set, scripts);
string_tree_finalize_token(tree); string_tree_finalize_token(tree);
return tree; return tree;