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

[fix] NULL checks

Browse Source
This commit is contained in:
Al
2016-07-15 13:17:33 -04:00
parent 2f5f226faa
commit ce78064988
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libpostal.c
View File

@@ -888,6 +888,9 @@ static void expand_alternative(cstring_array *strings, khash_t(str_set) *unique_
char_array_clear(temp_string); char_array_clear(temp_string);
string_tree_iterator_foreach_token(iter, token, { string_tree_iterator_foreach_token(iter, token, {
log_debug("token=%s\n", token); log_debug("token=%s\n", token);
if (token == NULL) {
continue;
}
char_array_append(temp_string, token); char_array_append(temp_string, token);
}) })
char_array_terminate(temp_string); char_array_terminate(temp_string);
@@ -933,9 +936,7 @@ char **expand_address(char *input, normalize_options_t options, size_t *n) {
options.languages = lang_response->languages; options.languages = lang_response->languages;
} }
} }
string_tree_t *tree = normalize_string_languages(input, normalize_string_options, options.num_languages, options.languages); string_tree_t *tree = normalize_string_languages(input, normalize_string_options, options.num_languages, options.languages);
cstring_array *strings = cstring_array_new_size(len * 2); cstring_array *strings = cstring_array_new_size(len * 2);
char_array *temp_string = char_array_new_size(len); char_array *temp_string = char_array_new_size(len);
@@ -959,6 +960,7 @@ char **expand_address(char *input, normalize_options_t options, size_t *n) {
bool is_first = true; bool is_first = true;
string_tree_iterator_foreach_token(iter, segment, { string_tree_iterator_foreach_token(iter, segment, {
if (segment == NULL) continue;
if (!is_first) { if (!is_first) {
char_array_append(temp_string, " "); char_array_append(temp_string, " ");
} }