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

[fix] Check that parser is loaded in parse_address, log and return NULL instead of segfaulting

Browse Source
This commit is contained in:
Al
2016-03-21 18:04:26 -04:00
parent be7b696cb2
commit 1b94727871
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/address_parser.c
View File

@@ -803,13 +803,18 @@ address_parser_response_t *address_parser_response_new(void) {
address_parser_response_t *address_parser_parse(char *address, char *language, char *country, address_parser_context_t *context) { address_parser_response_t *address_parser_parse(char *address, char *language, char *country, address_parser_context_t *context) {
if (address == NULL || context == NULL) return NULL; if (address == NULL || context == NULL) return NULL;
address_parser_t *parser = get_address_parser();
if (parser == NULL) {
log_error("parser is not setup, call libpostal_setup_address_parser()\n");
return NULL;
}
char *normalized = address_parser_normalize_string(address); char *normalized = address_parser_normalize_string(address);
bool is_normalized = normalized != NULL; bool is_normalized = normalized != NULL;
if (!is_normalized) { if (!is_normalized) {
normalized = address; normalized = address;
} }
address_parser_t *parser = get_address_parser();
averaged_perceptron_t *model = parser->model; averaged_perceptron_t *model = parser->model;
token_array *tokens = tokenize(normalized); token_array *tokens = tokenize(normalized);