From bab7b8d638ba0ac6901d4295586d1f9865cbbb76 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Sat, 2 May 2020 16:11:04 -0700
Subject: [PATCH] prefs: plug a memory leak.

Don't allocate the cols_hidden GString until we know we need it.

Change-Id: I02966d2820efeb5d61d259a567bf9063d8b519f1
Ping-Bug: 16335
Reviewed-on: https://code.wireshark.org/review/37043
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
---
 epan/prefs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epan/prefs.c b/epan/prefs.c
index e85a4a7ae3..d4daa2b422 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -2498,7 +2498,7 @@ column_hidden_type_description_cb(void)
 static char *
 column_hidden_to_str_cb(pref_t* pref, gboolean default_val)
 {
-    GString     *cols_hidden = g_string_new ("");
+    GString     *cols_hidden;
     GList       *clp;
     fmt_data    *cfmt;
     pref_t  *format_pref;
@@ -2506,6 +2506,7 @@ column_hidden_to_str_cb(pref_t* pref, gboolean default_val)
     if (default_val)
         return g_strdup(pref->default_val.string);
 
+    cols_hidden = g_string_new("");
     format_pref = prefs_find_preference(gui_column_module, PRS_COL_FMT);
     clp = (format_pref) ? *format_pref->varp.list : NULL;
     while (clp) {