dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #61: add strict decoding for TimeSynchronization

Browse Source
This commit is contained in:
Steve Karg
2020-01-07 08:19:02 -06:00
parent 35a8c47213
commit ed3f0982a3
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/bacdcode.c
+5 -1
View File
@@ -1037,7 +1037,11 @@ int decode_context_octet_string(
!decode_is_closing_tag(&apdu[len])) {
len += decode_tag_number_and_value(&apdu[len], &tag_number, &len_value);
status = octetstring_init(octet_string, &apdu[len], len_value);
if (len_value > 0) {
status = octetstring_init(octet_string, &apdu[len], len_value);
} else {
status = octetstring_init(octet_string, NULL, 0);
}
if (status) {
len += len_value;
src/bacnet/timesync.c
+5 -1
View File
@@ -264,7 +264,11 @@ int timesync_decode_timesync_recipients(
if (tag_number != BACNET_APPLICATION_TAG_OCTET_STRING) {
return BACNET_STATUS_ABORT;
}
len = decode_octet_string(&apdu[0], len_value_type, &octet_string);
len = bacnet_octet_string_decode(&apdu[apdu_len],
max_apdu, len_value_type, &octet_string);
if (len < 0) {
return BACNET_STATUS_ERROR;
}
apdu_len += len;
if (octetstring_length(&octet_string) == 0) {
/* -- A string of length 0 indicates a broadcast */