diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-15 13:35:38 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-15 21:36:07 +0000 |
| commit | d89de40449616c92d996e9314bcced9ab2fc5198 (patch) | |
| tree | 9da9d01c40c1e2991cd48a0c8dfda900ea3b801a /epan/dissectors/packet-atm.c | |
| parent | a9e126a617d46af80be7e8b258c5ddfcb82a5637 (diff) | |
Not passing a struct atm_phdr to an ATM dissector is a bug.
Check for it with DISSECTOR_ASSERT().
Change-Id: I71ba81107f7a4aff21b0f0dbecb5158dc4ff6238
Reviewed-on: https://code.wireshark.org/review/13318
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-atm.c')
| -rw-r--r-- | epan/dissectors/packet-atm.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index c60bda7dbb..60ce50aa47 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -1644,9 +1644,7 @@ dissect_atm_truncated(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void { struct atm_phdr *atm_info = (struct atm_phdr *)data; - if (!atm_info) { - return 0; - } + DISSECTOR_ASSERT(atm_info != NULL); return dissect_atm_common(tvb, pinfo, tree, TRUE, atm_info, FALSE); } @@ -1656,9 +1654,7 @@ dissect_atm_pw_truncated(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo { struct atm_phdr *atm_info = (struct atm_phdr *)data; - if (!atm_info) { - return 0; - } + DISSECTOR_ASSERT(atm_info != NULL); return dissect_atm_common(tvb, pinfo, tree, TRUE, atm_info, TRUE); } @@ -1668,9 +1664,7 @@ dissect_atm_untruncated(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi { struct atm_phdr *atm_info = (struct atm_phdr *)data; - if (!atm_info) { - return 0; - } + DISSECTOR_ASSERT(atm_info != NULL); return dissect_atm_common(tvb, pinfo, tree, FALSE, atm_info, FALSE); } @@ -1680,9 +1674,7 @@ dissect_atm_pw_untruncated(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { struct atm_phdr *atm_info = (struct atm_phdr *)data; - if (!atm_info) { - return 0; - } + DISSECTOR_ASSERT(atm_info != NULL); return dissect_atm_common(tvb, pinfo, tree, FALSE, atm_info, TRUE); } |