aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--epan/column-utils.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 7d1791f231..2e339fc069 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2257,6 +2257,7 @@ Martin van der Werff <martin [AT] vanderwerff.org>
Marco van den Bovenkamp <marco [AT] linuxgoeroe.dhs.org>
Ming Zhang <mingz [AT] ele.uri.edu>
Kelly Byrd <kbyrd-ethereal [AT] memcpy.com>
+Neil Piercy <Neil.Piercy [AT] ipaccess.com>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.
diff --git a/epan/column-utils.c b/epan/column-utils.c
index d02941cf48..83189e9588 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -258,6 +258,7 @@ col_add_fstr(column_info *cinfo, gint el, const gchar *format, ...) {
cinfo->col_data[i] = cinfo->col_buf[i];
}
vsnprintf(&cinfo->col_buf[i][fence], max_len - fence, format, ap);
+ cinfo->col_buf[i][max_len - 1] = '\0';
}
}
va_end(ap);
@@ -286,6 +287,7 @@ col_append_fstr(column_info *cinfo, gint el, const gchar *format, ...)
COL_CHECK_APPEND(cinfo, i, max_len);
len = strlen(cinfo->col_buf[i]);
vsnprintf(&cinfo->col_buf[i][len], max_len - len, format, ap);
+ cinfo->col_buf[i][max_len - 1] = '\0';
}
}
va_end(ap);
@@ -319,6 +321,7 @@ col_append_sep_fstr(column_info *cinfo, gint el, const gchar *separator,
COL_CHECK_APPEND(cinfo, i, max_len);
len = strlen(cinfo->col_buf[i]);
vsnprintf(&cinfo->col_buf[i][len], max_len - len, format, ap);
+ cinfo->col_buf[i][max_len-1] = 0;
}
}
va_end(ap);