From 62bfeba2c511fbcf05df8f1dca3dc40e95c14512 Mon Sep 17 00:00:00 2001 From: Steve Karg Date: Thu, 23 Apr 2020 07:29:56 -0500 Subject: [PATCH] Fixed #57 crash for get alarm summary. Thank you Walter! (#76) Co-authored-by: Steve Karg --- src/bacnet/basic/service/h_apdu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/bacnet/basic/service/h_apdu.c b/src/bacnet/basic/service/h_apdu.c index f43d54fb..f186d22b 100644 --- a/src/bacnet/basic/service/h_apdu.c +++ b/src/bacnet/basic/service/h_apdu.c @@ -381,7 +381,12 @@ uint16_t apdu_decode_confirmed_service_request(uint8_t *apdu, /* APDU data */ return 0; } } - if (apdu_len >= (len+2)) { + if (apdu_len == (len + 1)) { + /* no request data as seen with Inneasoft BACnet Explorer */ + *service_choice = apdu[len++]; + *service_request = NULL; + *service_request_len = 0; + } else if (apdu_len >= (len+2)) { *service_choice = apdu[len++]; *service_request = &apdu[len]; *service_request_len = apdu_len - len;