In "col_append_sep_fstr()" and "col_append_sep_str()", check "col_data"

rather than "col_buf", so that we correctly handle a column set with
"col_set_str()" (where we set "col_data" to point to the string, and
leave "col_buf" alone).


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

1 files changed, 2 insertions, 2 deletions

diff --git a/epan/column-utils.c b/epan/column-utils.c
index 83189e9588..92eedb50a0 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -309,7 +309,7 @@ col_append_sep_fstr(column_info *cinfo, gint el, const gchar *separator,
   else
 	max_len = COL_MAX_LEN;
 
-  if (cinfo->col_buf[0]) {
+  if (cinfo->col_data[0]) {
     col_append_str(cinfo, el, separator ? separator : ", ");
   }
   va_start(ap, format);
@@ -440,7 +440,7 @@ void
 col_append_sep_str(column_info *cinfo, gint el, const gchar* separator,
     const gchar* str)
 {
-  if (cinfo->col_buf[0]) {
+  if (cinfo->col_data[0]) {
     col_append_str(cinfo, el, separator ? separator : ", ");
   }  
   col_append_str(cinfo, el, str);