aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-04-11 19:27:57 -0700
committerGuy Harris <guy@alum.mit.edu>2018-04-12 02:28:43 +0000
commit148f39d900b516cac575d7de689a44545a663c70 (patch)
treec24f9c3c48091e5128d26153c808ffcbd93452c9
parent81f184bc00b938807cfdee72dc6f8d49412e26c6 (diff)
Need to flag a variable as volatile, due to the use of exceptions.
The exception mechanism is setjmp/longjmp-based, so we need to mark offset as volatile, otherwise the longjmp might not restore its value. Change-Id: Ib63070bbbbe1f16a93cb58aa7ee5ef2a5488df8a Reviewed-on: https://code.wireshark.org/review/26901 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--epan/dissectors/packet-mp2t.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index a4cbdc5565..413cda347d 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -1195,9 +1195,9 @@ dissect_tsp(tvbuff_t *tvb, gint offset, packet_info *pinfo,
static int
dissect_mp2t( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ )
{
- guint offset = 0;
- conversation_t *conv;
- const char *saved_proto;
+ volatile guint offset = 0;
+ conversation_t *conv;
+ const char *saved_proto;
conv = find_or_create_conversation(pinfo);