diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-04-16 20:44:27 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-04-17 00:51:23 +0000 |
| commit | a919be5ff4f0418112aa7aeb0e078979d65ee095 (patch) | |
| tree | 700ad00932182befdc5d5866897bdb0383d254ca /epan/dissectors/packet-windows-common.c | |
| parent | 19a3d046f2bad1f3169fcae9e09c5424bb096396 (diff) | |
Fix gcc "might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]" introduced by 19a3d046f2
[Apparently (at least) the Ubuntu buildbot gcc (presumably < 4.9) needs two vars
to be marked volatile even though gcc.4.9 (Fedora) doesn't.
Change-Id: Icf95511d08a31547196874aecb60d85cab975cfb
Reviewed-on: https://code.wireshark.org/review/1179
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-windows-common.c')
| -rw-r--r-- | epan/dissectors/packet-windows-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c index c7c9493e92..2147d6be89 100644 --- a/epan/dissectors/packet-windows-common.c +++ b/epan/dissectors/packet-windows-common.c @@ -2209,11 +2209,11 @@ dissect_nt_acl(tvbuff_t *tvb, int offset_a, packet_info *pinfo, struct access_mask_info *ami) { proto_item *volatile item = NULL; - proto_tree *tree = NULL; + proto_tree *volatile tree = NULL; int old_offset = offset_a; int pre_ace_offset; guint16 revision; - guint32 num_aces; + volatile guint32 num_aces; volatile int offset_v = offset_a; volatile gboolean missing_data = FALSE; volatile gboolean bad_ace = FALSE; |