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

Fix [bug#79] Out of bounds jump in h_apdu.c:apdu_handler (#446)

Browse Source 
* Fix [bug#79] Out of bounds jump in h_apdu.c:apdu_handler
---------
Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2023-07-10 15:15:55 -05:00
committed by GitHub
parent 1cfe6ee80f
commit 13c85db4cb
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+6
View File
@@ -14,6 +14,12 @@ The git repositories are hosted at the following sites:
## [Unreleased] ## [Unreleased]
### Security
- Fix [bug#79] out of bounds jump in h_apdu.c:apdu_handler (#446)
### Fixed
- Fix segfault on mstp cleanup on linux port (#445) - Fix segfault on mstp cleanup on linux port (#445)
- Fix minimal config by adding bitstring (#443) - Fix minimal config by adding bitstring (#443)
- Fix WhoIs app APDU timeout (#444) - Fix WhoIs app APDU timeout (#444)
src/bacnet/basic/service/h_apdu.c
+19 -5
View File
@@ -293,6 +293,11 @@ bool apdu_confirmed_simple_ack_service(
return status; return status;
} }
/**
* @brief Set the the BACnet Simple Ack Service handler
* @param service_choice [in] BACnet confirmed service choice
* @param pFunction [in] handler for the service
*/
void apdu_set_confirmed_simple_ack_handler( void apdu_set_confirmed_simple_ack_handler(
BACNET_CONFIRMED_SERVICE service_choice, BACNET_CONFIRMED_SERVICE service_choice,
confirmed_simple_ack_function pFunction) confirmed_simple_ack_function pFunction)
@@ -302,11 +307,18 @@ void apdu_set_confirmed_simple_ack_handler(
} }
} }
/**
* @brief Set the the BACnet Confirmed Ack Service handler
* @param service_choice [in] BACnet confirmed service choice
* @param pFunction [in] handler for the service
*/
void apdu_set_confirmed_ack_handler( void apdu_set_confirmed_ack_handler(
BACNET_CONFIRMED_SERVICE service_choice, confirmed_ack_function pFunction) BACNET_CONFIRMED_SERVICE service_choice, confirmed_ack_function pFunction)
{ {
if (!apdu_confirmed_simple_ack_service(service_choice)) { if (!apdu_confirmed_simple_ack_service(service_choice)) {
Confirmed_ACK_Function[service_choice].complex = pFunction; if (service_choice < MAX_BACNET_CONFIRMED_SERVICE) {
Confirmed_ACK_Function[service_choice].complex = pFunction;
}
} }
} }
@@ -640,11 +652,13 @@ void apdu_handler(BACNET_ADDRESS *src,
service_request = &apdu[len]; service_request = &apdu[len];
service_request_len = apdu_len - (uint16_t)len; service_request_len = apdu_len - (uint16_t)len;
if (!apdu_confirmed_simple_ack_service(service_choice)) { if (!apdu_confirmed_simple_ack_service(service_choice)) {
if (Confirmed_ACK_Function[service_choice] if (service_choice < MAX_BACNET_CONFIRMED_SERVICE) {
if (Confirmed_ACK_Function[service_choice]
.complex != NULL) { .complex != NULL) {
Confirmed_ACK_Function[service_choice].complex( Confirmed_ACK_Function[service_choice].complex(
service_request, service_request_len, src, service_request, service_request_len, src,
&service_ack_data); &service_ack_data);
}
} }
tsm_free_invoke_id(invoke_id); tsm_free_invoke_id(invoke_id);
} }