diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-06-19 15:28:39 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-19 22:28:50 +0000 |
| commit | fb9a7d43cde773a0f006db580c5907dd2c4a4d98 (patch) | |
| tree | e884a8371bef0c4f546d63d0191a6a1bf5910d0d /ui/gtk | |
| parent | 30919f7708a40ac536da07e6157e0f2ec250abe6 (diff) | |
Don't assume we successfully read the configuration files.
read_configuration_files() can fail and return NULL, so check that
commandline_info.prefs_p is non-null before dereferencing it.
Fixes CID 1362778.
Change-Id: I3066769c474d394fbfe548b50d6be704964e59d3
Reviewed-on: https://code.wireshark.org/review/16028
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 398da4f3b5..a30792e372 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -2497,7 +2497,9 @@ main(int argc, char *argv[]) #ifdef HAVE_LIBPCAP if ((global_capture_opts.num_selected == 0) && - ((prefs.capture_device != NULL) && (*commandline_info.prefs_p->capture_device != '\0'))) { + ((prefs.capture_device != NULL) && + (commandline_info.prefs_p != NULL) && + (*commandline_info.prefs_p->capture_device != '\0'))) { guint i; interface_t device; for (i = 0; i < global_capture_opts.all_ifaces->len; i++) { |