aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-megaco.c
diff options
context:
space:
mode:
authorAndersBroman <anders.broman@ericsson.com>2017-09-20 16:08:56 +0200
committerMichael Mann <mmann78@netscape.net>2017-09-20 15:29:27 +0000
commitf1501b82a7354de76a8d3833db2aa8fa8b9d62e0 (patch)
treeebf5f39be9e999e58939310966edbe0045421967 /epan/dissectors/packet-megaco.c
parentb1395ce1f70889b07075e6d6841fe3e91474084c (diff)
[MEGACO] In dissect_megaco_eventsdescriptor() check for dm(DigitMap) not
only d as it may get confused with dt(delayTime). Change-Id: Ie5ac2a117f2d9e4a231d8ee15c795b3abdc4da07 Reviewed-on: https://code.wireshark.org/review/23643 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-megaco.c')
-rw-r--r--epan/dissectors/packet-megaco.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index 147ffee286..27ae4ebb18 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -1994,7 +1994,6 @@ dissect_megaco_eventsdescriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *m
gint tvb_events_end_offset, tvb_LBRKT;
proto_tree *megaco_eventsdescriptor_tree, *megaco_requestedevent_tree;
proto_item *megaco_eventsdescriptor_ti, *megaco_requestedevent_ti, *ti;
- guint8 tempchar;
gint requested_event_start_offset = 0,
requested_event_end_offset = 0;
@@ -2085,12 +2084,11 @@ dissect_megaco_eventsdescriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *m
if ( tvb_help_offset < tvb_RBRKT && tvb_help_offset != -1 ){
tvb_help_offset = megaco_tvb_skip_wsp(tvb, requested_event_start_offset +1);
- tempchar = tvb_get_guint8(tvb, tvb_help_offset);
requested_event_start_offset = megaco_tvb_skip_wsp(tvb, requested_event_start_offset +1);
requested_event_end_offset = megaco_tvb_skip_wsp_return(tvb, requested_event_end_offset-1);
- if ( tempchar == 'D' || tempchar == 'd'){
+ if (!tvb_strncaseeql(tvb, requested_event_start_offset, "dm", 2)) {
dissect_megaco_digitmapdescriptor(tvb, megaco_requestedevent_tree, requested_event_end_offset, requested_event_start_offset);
}
else{