From 28971b28518ba0c210690d97c29df984064f4cca Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 15 Jul 2014 17:14:11 -0700 Subject: 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 --- file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'file.c') 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(); -- cgit v1.2.3