osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

BACAPP: event-time-stamps decode fix 

event-time-stamps decode when array-index is 0.

Bug: 12422
Change-Id: I9f1f90e269352a49a8fc8a2ba2f64211f3cf7961
Reviewed-on: https://code.wireshark.org/review/15409
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Lori Tribble 2016-05-12 21:08:35 -04:00 committed by Michael Mann
parent eb047b0ec7
commit de61fb1cfb
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-bacapp.c
View File

@ -6914,7 +6914,13 @@ fAbstractSyntaxNType(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint
offset = fDeviceObjectReference(tvb, pinfo, tree, offset);
break;
case 130: /* event-time-stamp */
offset = fEventTimeStamps(tvb, pinfo, tree, offset);
if (propertyArrayIndex == 0) {
/* BACnetARRAY index 0 refers to the length
of the array, not the elements of the array */
offset = fApplicationTypes(tvb, pinfo, tree, offset, ar);
} else {
offset = fEventTimeStamps(tvb, pinfo, tree, offset);
}
break;
case 197: /* logging-type */
offset = fApplicationTypesEnumerated(tvb, pinfo, tree, offset, ar, BACnetLoggingType);