osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

maxmind: check val_start before using it. 

Change-Id: Id3ee8e8d4c54c02d68048ec677fdda599b329713
Reviewed-on: https://code.wireshark.org/review/26417
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Dario Lombardo 2018-03-10 19:33:46 +01:00 committed by Gerald Combs
parent 2a9097046e
commit 3ceff67514
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/maxmind_db.c
View File

@ -169,10 +169,10 @@ process_mmdbr_stdout(void) {
} else if (val_start && g_str_has_prefix(line, RES_COUNTRY_NAMES_EN)) {
cur_lookup.found = TRUE;
cur_lookup.country = chunkify_string(val_start);
} else if (g_str_has_prefix(line, RES_CITY_NAMES_EN)) {
} else if (val_start && g_str_has_prefix(line, RES_CITY_NAMES_EN)) {
cur_lookup.found = TRUE;
cur_lookup.city = chunkify_string(val_start);
} else if (g_str_has_prefix(line, RES_ASN_ORG)) {
} else if (val_start && g_str_has_prefix(line, RES_ASN_ORG)) {
cur_lookup.found = TRUE;
cur_lookup.as_org = chunkify_string(val_start);
} else if (val_start && g_str_has_prefix(line, RES_ASN_NUMBER)) {
@ -181,10 +181,10 @@ process_mmdbr_stdout(void) {
} else {
MMDB_DEBUG("Invalid as number: %s", val_start);
}
} else if (g_str_has_prefix(line, RES_LOCATION_LATITUDE)) {
} else if (val_start && g_str_has_prefix(line, RES_LOCATION_LATITUDE)) {
cur_lookup.found = TRUE;
cur_lookup.latitude = g_ascii_strtod(val_start, NULL);
} else if (g_str_has_prefix(line, RES_LOCATION_LONGITUDE)) {
} else if (val_start && g_str_has_prefix(line, RES_LOCATION_LONGITUDE)) {
cur_lookup.found = TRUE;
cur_lookup.longitude = g_ascii_strtod(val_start, NULL);
} else if (g_str_has_prefix(line, RES_END)) {