diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-12-06 21:19:01 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-12-07 05:46:56 +0000 |
| commit | 29768d91ec60023cc68cb38edc492a6d2221f662 (patch) | |
| tree | 05aa76c48ae0c4633550b517b5dc9ea71f0e44dd | |
| parent | 0863a2c4659ca1c874f414b0720465f0fae771d9 (diff) | |
| download | wireshark-29768d91ec60023cc68cb38edc492a6d2221f662.tar.gz wireshark-29768d91ec60023cc68cb38edc492a6d2221f662.tar.bz2 wireshark-29768d91ec60023cc68cb38edc492a6d2221f662.zip | |
RTCP: Bugfix MS Video Source Request dissection
Bug: 13212
Change-Id: I249d38e843f737bbd0773828f24980d148fbaa00
Reviewed-on: https://code.wireshark.org/review/19126
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-rtcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 1c5e02b188..2bb3e93e6c 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -950,13 +950,13 @@ dissect_rtcp_asfb_ms( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * type_item = proto_tree_add_item( tree, hf_rtcp_psfb_ms_type, tvb, offset, 2, ENC_BIG_ENDIAN ); offset += 2; - length = tvb_get_ntohs(tvb, offset) - 1; + length = tvb_get_ntohs(tvb, offset) - 4; proto_tree_add_item( tree, hf_rtcp_psfb_ms_length, tvb, offset, 2, ENC_BIG_ENDIAN ); offset += 2; if (type == 1) { - rtcp_ms_vsr_tree = proto_tree_add_subtree(tree, tvb, offset, hf_rtcp_psfb_ms_length, ett_ms_vsr, &item, "MS Video Source Request"); + rtcp_ms_vsr_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ms_vsr, &item, "MS Video Source Request"); col_append_fstr(pinfo->cinfo, COL_INFO,"( MS-VSR )"); @@ -1050,7 +1050,7 @@ dissect_rtcp_asfb_ms( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * else if (type == 3) { /* MS Dominant Speaker History */ - rtcp_ms_ds_tree = proto_tree_add_subtree(tree, tvb, offset, hf_rtcp_psfb_ms_length, ett_ms_ds, NULL, "MS Dominant Speaker History"); + rtcp_ms_ds_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ms_ds, NULL, "MS Dominant Speaker History"); col_append_fstr(pinfo->cinfo, COL_INFO,"( MS-DSH )"); while (length-- && tvb_captured_length_remaining (tvb, offset) >= 4) { |