aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2016-06-15 10:53:43 -0700
committerAnders Broman <a.broman58@gmail.com>2016-06-15 18:01:24 +0000
commitde23fbc7247f57226dee0ea35ddb4ba0cac42716 (patch)
tree4831d676a0656cfb35e671ce5f2cc4e119bfd401 /epan
parentec5acbc33cfc8e6c82706574814d7232b26112c0 (diff)
zbee-nwk: don't THROW() an exception from a dissector
we already have an expert info, so we can just return the number of bytes in the tvb Change-Id: I6199760316d7ef141877bc8f65012d36e4dd357b Reviewed-on: https://code.wireshark.org/review/15925 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-zbee-nwk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c
index 25824b75b9..accdfa50d0 100644
--- a/epan/dissectors/packet-zbee-nwk.c
+++ b/epan/dissectors/packet-zbee-nwk.c
@@ -708,7 +708,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
if (offset >= tvb_captured_length(tvb)) {
/* Non-existent or truncated payload. */
expert_add_info(pinfo, proto_root, &ei_zbee_nwk_missing_payload);
- THROW(BoundsError);
+ return tvb_captured_length(tvb);
}
/* Payload is encrypted, attempt security operations. */
else if (packet.security) {