diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-05-20 07:15:27 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-05-20 07:15:27 +0000 |
| commit | aa07804fcb21e0dbdd039234205b4d63745408c7 (patch) | |
| tree | 0faafb622117f93ec0f6954bd812367f3e8a6124 /gtk | |
| parent | b640f635d7ea366ca57b02768d2f30224f8fd830 (diff) | |
Don't assume that certain address columns are always constant strings -
they're no more guaranteed to be constant strings than the columns we're
*not* assuming are constant strings. Fixes bug 4771.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32906 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/packet_list_store.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gtk/packet_list_store.c b/gtk/packet_list_store.c index 3c62ceaf5f..fae8f8bec9 100644 --- a/gtk/packet_list_store.c +++ b/gtk/packet_list_store.c @@ -684,6 +684,7 @@ packet_list_change_record(PacketList *packet_list, guint row, gint col, column_i return; switch (cfile.cinfo.col_fmt[col]) { + case COL_DEF_SRC: case COL_RES_SRC: /* COL_DEF_SRC is currently just like COL_RES_SRC */ case COL_UNRES_SRC: case COL_DEF_DL_SRC: @@ -692,6 +693,7 @@ packet_list_change_record(PacketList *packet_list, guint row, gint col, column_i case COL_DEF_NET_SRC: case COL_RES_NET_SRC: case COL_UNRES_NET_SRC: + case COL_DEF_DST: case COL_RES_DST: /* COL_DEF_DST is currently just like COL_RES_DST */ case COL_UNRES_DST: case COL_DEF_DL_DST: @@ -700,16 +702,6 @@ packet_list_change_record(PacketList *packet_list, guint row, gint col, column_i case COL_DEF_NET_DST: case COL_RES_NET_DST: case COL_UNRES_NET_DST: - g_assert(cinfo->col_data[col] != cinfo->col_buf[col]); - /* This is a constant string, so we don't have to copy it */ - record->fdata->col_text[col] = (gchar *) cinfo->col_data[col]; - record->fdata->col_text_len[col] = (guint) strlen(record->fdata->col_text[col]); -#ifdef NEW_PACKET_LIST_STATISTICS - ++packet_list->const_strings; -#endif - break; - case COL_DEF_SRC: - case COL_DEF_DST: case COL_PROTOCOL: case COL_INFO: case COL_IF_DIR: |