diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-10-12 18:08:23 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-10-12 18:08:23 +0000 |
| commit | e6aea4674c3621824bb7f96a62e594bfefa16dae (patch) | |
| tree | 2d0ad9ee0f531579b1b3a2c5d06d1f414b74deb6 /epan/column-utils.c | |
| parent | cac43ef3cbf89d61a4b420291724cdbece2f019f (diff) | |
From Tomas Kukosa: fix "col_set_str()" to work correctly with fenced
columns.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12283 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/column-utils.c')
| -rw-r--r-- | epan/column-utils.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 08044c759b..ecf245c6dc 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -195,7 +195,7 @@ col_set_str(column_info *cinfo, gint el, gchar* str) { int i; int fence; - size_t len, max_len; + size_t max_len; if (el == COL_INFO) max_len = COL_MAX_INFO_LEN; @@ -213,8 +213,7 @@ col_set_str(column_info *cinfo, gint el, gchar* str) */ COL_CHECK_APPEND(cinfo, i, max_len); - len = strlen(cinfo->col_buf[i]); - strncat(cinfo->col_buf[i], str, max_len - len); + strncpy(&cinfo->col_buf[i][fence], str, max_len - fence); cinfo->col_buf[i][max_len - 1] = 0; } else { /* |