diff options
| author | Dario Lombardo <lomato@gmail.com> | 2018-03-10 19:33:46 +0100 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-03-11 02:11:55 +0000 |
| commit | 3ceff6751471edc205894f8f2b6d050f3a803502 (patch) | |
| tree | 8bb7c15144d6502b24fcc16a785fc85157e776cf /epan | |
| parent | 2a9097046e51d67794780bb57e94229e769fc01b (diff) | |
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>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/maxmind_db.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/maxmind_db.c b/epan/maxmind_db.c index 484be7f355..033b76dcc1 100644 --- a/epan/maxmind_db.c +++ b/epan/maxmind_db.c @@ -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)) { |