diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-10-19 10:04:39 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-10-19 14:14:22 +0000 |
| commit | 8def8ef9c40189472a46d9b1ad95289780e09af5 (patch) | |
| tree | 919b03009cb54958d752a072b3a780fa81ab2365 /epan/dissectors/packet-amqp.c | |
| parent | 8842e2e893822297b5d84ecd06e0e9ae6d914a61 (diff) | |
| download | wireshark-8def8ef9c40189472a46d9b1ad95289780e09af5.tar.gz | |
packet-amqp.c: Temporary/preliminary fix for Bug #10582 (crash)
This is a temporary/preliminary fix to prevent the buildbot fuzz-test
failures seen when testing the capture file attached to Bug #10582.
As noted in the bug, a complete fix will require some reworking of
the amqp dissector.
Change-Id: I2571f1eeb46a7eede04b8d809e87b95f1ff529df
Reviewed-on: https://code.wireshark.org/review/4835
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-amqp.c')
| -rw-r--r-- | epan/dissectors/packet-amqp.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 368c9b13c1..351b691e36 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -54,10 +54,20 @@ static guint amqp_port = 5672; /* Generic defines */ +#if 0 #define AMQP_INCREMENT(offset, addend, bound) {\ offset += (addend);\ THROW_ON((offset > bound), ReportedBoundsError); \ } +#else /* --> (temporary until in-progress code review completed; See Bug #10582) */ +#define AMQP_INCREMENT(offset, addend, bound) {\ + THROW_ON( \ + (((unsigned)(offset) + (unsigned)(addend)) < (unsigned)(offset)) || \ + (((unsigned)(offset) + (unsigned)(addend)) > (unsigned)(bound )) \ + , ReportedBoundsError); \ + offset += (addend); \ +} +#endif /* * This dissector handles AMQP 0-9, 0-10 and 1.0. The conversation structure |