diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-06-19 15:18:00 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-19 22:18:14 +0000 |
| commit | 30919f7708a40ac536da07e6157e0f2ec250abe6 (patch) | |
| tree | 359db2c7255e9e9e934212b204aff803ab4f51ca /epan/geoip_db.c | |
| parent | 234d8eacec8807924945df55821b79f90e371c65 (diff) | |
| download | wireshark-30919f7708a40ac536da07e6157e0f2ec250abe6.tar.gz | |
Don't assume we have an array of GeoIP databases.
The attempt to open them might fail; if geoip_dat_arr is null, just
return 0 as the number of databases, don't crash.
Change-Id: I967d863d328a42d7dce79f58d4fa67d922d0cb2c
Reviewed-on: https://code.wireshark.org/review/16025
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/geoip_db.c')
| -rw-r--r-- | epan/geoip_db.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/geoip_db.c b/epan/geoip_db.c index 18bc7c076d..01b743bc26 100644 --- a/epan/geoip_db.c +++ b/epan/geoip_db.c @@ -230,7 +230,7 @@ geoip_db_pref_init(module_t *nameres) guint geoip_db_num_dbs(void) { - return geoip_dat_arr->len; + return (geoip_dat_arr == NULL) ? 0 : geoip_dat_arr->len; } const gchar * |