From 907a8259862401af3fdc8ad1201e13c6abf677db Mon Sep 17 00:00:00 2001 From: Hadriel Kaplan Date: Tue, 25 Feb 2014 11:05:17 -0500 Subject: [PATCH] Fix file.c: Dereference of null pointer (clang analyzer) Change-Id: Ib96e5ffb284234562c2883c13e93109173e22179 Reviewed-on: https://code.wireshark.org/review/368 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte --- file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/file.c b/file.c index 9b2def0602..0bc62c3986 100644 --- a/file.c +++ b/file.c @@ -1629,10 +1629,10 @@ cf_merge_files(char **out_filenamep, int in_file_count, * the file type and subtype we're writing; note that, and report * the frame number and file type/subtype. */ - display_basename = g_filename_display_basename(in_file->filename); + display_basename = g_filename_display_basename(in_file ? in_file->filename : "UNKNOWN"); simple_error_message_box( "Frame %u of \"%s\" has a network type that can't be saved in a \"%s\" file.", - in_file->packet_num, display_basename, + in_file ? in_file->packet_num : 0, display_basename, wtap_file_type_subtype_string(file_type)); g_free(display_basename); break; @@ -1643,10 +1643,10 @@ cf_merge_files(char **out_filenamep, int in_file_count, * the file type and subtype we're writing; note that, and report * the frame number and file type/subtype. */ - display_basename = g_filename_display_basename(in_file->filename); + display_basename = g_filename_display_basename(in_file ? in_file->filename : "UNKNOWN"); simple_error_message_box( "Frame %u of \"%s\" is too large for a \"%s\" file.", - in_file->packet_num, display_basename, + in_file ? in_file->packet_num : 0, display_basename, wtap_file_type_subtype_string(file_type)); g_free(display_basename); break;