5 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-atn-cm.c b/epan/dissectors/packet-atn-cm.c
index 2f5870427b..e7ca5a1278 100644
--- a/epan/dissectors/packet-atn-cm.c
+++ b/epan/dissectors/packet-atn-cm.c
@@ -689,7 +689,7 @@ dissect_atn_cm_heur(
 		void *data _U_)
 {
 		atn_conversation_t *atn_cv = NULL;
-		gboolean is_atn_cm = FALSE;
+		volatile gboolean is_atn_cm = FALSE;
 		int type;
 
 		/* determine whether it is uplink or downlink */
diff --git a/epan/dissectors/packet-atn-cpdlc.c b/epan/dissectors/packet-atn-cpdlc.c
index 417ec2bb88..5ff3d39e7f 100644
--- a/epan/dissectors/packet-atn-cpdlc.c
+++ b/epan/dissectors/packet-atn-cpdlc.c
@@ -5413,8 +5413,8 @@ dissect_atn_cpdlc_heur(
 		void *data _U_)
 {
 		atn_conversation_t *atn_cv = NULL;
-		gboolean is_atn_cpdlc = FALSE;
-		gboolean is_pm = FALSE;
+		volatile gboolean is_atn_cpdlc = FALSE;
+		volatile gboolean is_pm = FALSE;
 		int type = no_msg;
 
 		type = check_heur_msg_type(pinfo);
diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c
index 4459513e21..9c236866e7 100644
--- a/epan/dissectors/packet-t124.c
+++ b/epan/dissectors/packet-t124.c
@@ -2960,7 +2960,7 @@ static gboolean
 dissect_t124_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_)
 {
   asn1_ctx_t asn1_ctx;
-  gboolean failed = FALSE;
+  volatile gboolean failed = FALSE;
 
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
 
diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c
index a0f1516fe1..67a76398ae 100644
--- a/epan/dissectors/packet-t125.c
+++ b/epan/dissectors/packet-t125.c
@@ -423,7 +423,7 @@ dissect_t125_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, vo
   gint32 tag;
   guint32 choice_index = 100;
   asn1_ctx_t asn1_ctx;
-  gboolean failed;
+  volatile gboolean failed;
 
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
 
diff --git a/epan/wslua/wslua_tree.c b/epan/wslua/wslua_tree.c
index 08742c4394..78c4390e41 100644
--- a/epan/wslua/wslua_tree.c
+++ b/epan/wslua/wslua_tree.c
@@ -157,7 +157,7 @@ WSLUA_METHOD TreeItem_add_packet_field(lua_State *L) {
     guint encoding;
     proto_item* item = NULL;
     volatile int nargs;
-    gint err = 0;
+    volatile gint err = 0;
     const char *volatile error = NULL;
 
     if (!tree_item) {
@@ -211,9 +211,9 @@ WSLUA_METHOD TreeItem_add_packet_field(lua_State *L) {
     }
 
     TRY {
-
-        item = try_add_packet_field(L, tree_item, tvbr, hfid, type, encoding, &err);
-
+        gint errx = 0;
+        item = try_add_packet_field(L, tree_item, tvbr, hfid, type, encoding, &errx);
+        err = errx;
     } CATCH_ALL {
         show_exception(tvbr->tvb->ws_tvb, lua_pinfo, tree_item->tree, EXCEPT_CODE, GET_MESSAGE);
         error = "Lua programming error";