summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-07-15 17:14:11 -0700
committerGuy Harris <guy@alum.mit.edu>2014-07-16 00:14:35 +0000
commit28971b28518ba0c210690d97c29df984064f4cca (patch)
treeddff4667ae1b7a32249f72f5d39e0d6475599c70 /file.c
parentd4dab16a3fed4dc399083e454226675894b42871 (diff)
downloadwireshark-28971b28518ba0c210690d97c29df984064f4cca.tar.gz
Squelch a warning.
In at least some versions of GLib, g_array_free() warns if passed a null pointer, rather than just silently returning. Change-Id: I1bfc0a81faa1eeebe288f6e0cc58ebfb64784958 Reviewed-on: https://code.wireshark.org/review/3068 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'file.c')
-rw-r--r--file.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/file.c b/file.c
index 25d1ec2684..576b9c783c 100644
--- a/file.c
+++ b/file.c
@@ -500,8 +500,10 @@ cf_close(capture_file *cf)
cf->finfo_selected = NULL;
/* No frame link-layer types, either. */
- g_array_free(cf->linktypes, TRUE);
- cf->linktypes = NULL;
+ if (cf->linktypes != NULL) {
+ g_array_free(cf->linktypes, TRUE);
+ cf->linktypes = NULL;
+ }
/* Clear the packet list. */
packet_list_freeze();