Only initialize fields in the print_args that are actually used.

This prevents a memory leak where we were allocating for print_args.range
but never freeing.

svn path=/trunk/; revision=43921

1 files changed, 6 insertions, 4 deletions

diff --git a/tshark.c b/tshark.c
index 7ba8124c3e..10d55a5143 100644
--- a/tshark.c
+++ b/tshark.c
@@ -3416,15 +3416,17 @@ print_packet(capture_file *cf, epan_dissect_t *edt)
     switch (output_action) {
 
     case WRITE_TEXT:
+      /* Only initialize the fields that are actually used in proto_tree_print.
+       * This is particularly important for .range, as that's heap memory which
+       * we would otherwise have to g_free().
       print_args.to_file = TRUE;
       print_args.format = print_format;
       print_args.print_summary = !verbose;
-      print_args.print_hex = verbose && print_hex;
       print_args.print_formfeed = FALSE;
-      print_args.print_dissections = verbose ? print_dissections_expanded : print_dissections_none;
-
-      /* init the packet range */
       packet_range_init(&print_args.range);
+      */
+      print_args.print_hex = verbose && print_hex;
+      print_args.print_dissections = verbose ? print_dissections_expanded : print_dissections_none;
 
       if (!proto_tree_print(&print_args, edt, print_stream))
         return FALSE;