diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-08-28 15:49:22 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-08-29 01:20:22 +0000 |
| commit | e18e400e6842a3977e26f84cba2cbb3fc6873f8d (patch) | |
| tree | 325edbc95c1a396182431541ea98a31af2ee0883 /ui/qt/decode_as_dialog.h | |
| parent | 1663224c24b38dac3218c8690d1035f5b63a548f (diff) | |
Fix a GHashTable assertion in DecodeAsDialog.
Make sure we don't call g_hash_table_removed from g_hash_table_foreach,
which generates an assertion error.
Bug: 11426
Change-Id: I00283c97b0fc63551b901c0fd526b60c0fb80ace
Reviewed-on: https://code.wireshark.org/review/10296
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/decode_as_dialog.h')
| -rw-r--r-- | ui/qt/decode_as_dialog.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/qt/decode_as_dialog.h b/ui/qt/decode_as_dialog.h index 1b11a84702..a00d92187c 100644 --- a/ui/qt/decode_as_dialog.h +++ b/ui/qt/decode_as_dialog.h @@ -58,9 +58,11 @@ private: QComboBox *selector_combo_box_; QComboBox *cur_proto_combo_box_; QMap<QString, const char *> ui_name_to_name_; + QList<QPair<const char *, guint32> > changed_uint_entries_; + QList<QPair<const char *, const char *> > changed_string_entries_; QString entryString(const gchar *table_name, gpointer value); - static void resetChangedList(const gchar *table_name, ftenum_t selector_type, + static void gatherChangedEntries(const gchar *table_name, ftenum_t selector_type, gpointer key, gpointer value, gpointer user_data); static void buildChangedList(const gchar *table_name, ftenum_t selector_type, gpointer key, gpointer value, gpointer user_data); |