Check for valid column titles (non-zero-length) and valid column formats

in preference settings.

In the process of doing that, fix a memory leak (we were handing a null
pointer, rather than a pointer to the list of strings in
"column.format", to "clear_string_list()").


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3775 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 2 insertions, 2 deletions

diff --git a/column.c b/column.c
index 6f1588e107..90841602ea 100644
--- a/column.c
+++ b/column.c
@@ -1,7 +1,7 @@
 /* column.c
  * Routines for handling column preferences
  *
- * $Id: column.c,v 1.32 2001/07/22 21:28:46 guy Exp $
+ * $Id: column.c,v 1.33 2001/07/22 21:50:46 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -376,7 +376,7 @@ get_column_format_from_str(gchar *str) {
     }
     cptr++;
   }
-  return COL_NUMBER;
+  return -1;	/* illegal */
 }
 
 gchar *