diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-06-18 21:33:08 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-06-18 21:33:08 +0000 |
| commit | 39f1f0bcb7d528451d0f959e7c8ad801fb089c81 (patch) | |
| tree | 3d92861a04fa25b38a57bfe1237c611c905f225a | |
| parent | fc881f6f372d6d00ce85ecf3168e00bd76707408 (diff) | |
Fix r43338 once again :(
svn path=/trunk/; revision=43342
| -rw-r--r-- | ui/gtk/packet_list_store.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c index 19b1dc8ab6..0c82fb4b25 100644 --- a/ui/gtk/packet_list_store.c +++ b/ui/gtk/packet_list_store.c @@ -714,22 +714,26 @@ packet_list_change_record(PacketList *packet_list, guint row, gint col, column_i case COL_EXPERT: case COL_FREQ_CHAN: if (cinfo->col_data[col] && cinfo->col_data[col] != cinfo->col_buf[col]) { + col_text_len = strlen(cinfo->col_data[col]); + if (col_text_len > G_MAXUSHORT) + col_text_len = G_MAXUSHORT; + /* This is a constant string, so we don't have to copy it */ record->col_text[col] = (gchar *) cinfo->col_data[col]; + record->col_text_len[col] = (gushort) col_text_len; #ifdef NEW_PACKET_LIST_STATISTICS ++packet_list->const_strings; #endif - - col_text_len = strlen(record->col_text[col]); - if (col_text_len > G_MAXUSHORT) - col_text_len = G_MAXUSHORT; - - record->col_text_len[col] = (gushort) col_text_len; break; } /* !! FALL-THROUGH!! */ default: + col_text_len = strlen(cinfo->col_data[col]); + if (col_text_len > G_MAXUSHORT) + col_text_len = G_MAXUSHORT; + + record->col_text_len[col] = (gushort) col_text_len; if (!record->col_text_len[col]) { record->col_text[col] = ""; #ifdef NEW_PACKET_LIST_STATISTICS @@ -747,11 +751,6 @@ packet_list_change_record(PacketList *packet_list, guint row, gint col, column_i str = g_string_chunk_insert_const (packet_list->string_pool, (const gchar *)cinfo->col_data[col]); } record->col_text[col] = str; - - col_text_len = strlen(record->col_text[col]); - if (col_text_len > G_MAXUSHORT) - col_text_len = G_MAXUSHORT; - record->col_text_len[col] = (gushort) col_text_len; break; } } |