Merging upstream version 4.2.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 0 deletions

diff --git a/epan/wslua/wslua.h b/epan/wslua/wslua.h
index 0f6a146e..c96f4f2c 100644
--- a/epan/wslua/wslua.h
+++ b/epan/wslua/wslua.h
@@ -188,8 +188,12 @@ typedef struct _wslua_proto_t {
     gboolean expired;
 } wslua_proto_t;
 
+/* a "DissectorTable" object can be different things under the hood,
+ * since its heuristic_new() can create a heur_dissector_list_t that
+ * needs to be deregistered. */
 struct _wslua_distbl_t {
     dissector_table_t table;
+    heur_dissector_list_t heur_list;
     const gchar* name;
     const gchar* ui_name;
     gboolean created;