Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2024-12-18 19:08:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent use of uninitialized _savedAsapXXX variables (#241)

Browse Source 
- src/knx/application_layer.h: Initialize _savedAsapXXX
- src/knx/application_layer.cpp: prevent xxxConfirm-Calls if _savedAsapXXX values are 0

Co-authored-by: Waldemar Porscha <wp@porscha.eu>
This commit is contained in:
mumpf 2023-05-05 00:42:28 +02:00 committed by GitHub
parent 0d140a5182
commit d52df6d584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/knx/application_layer.cpp
View File

@ -82,13 +82,25 @@ void ApplicationLayer::dataGroupConfirm(AckType ack, HopCountType hopType, Prior
switch (apdu.type()) switch (apdu.type())
{ {
case GroupValueRead: case GroupValueRead:
if (_savedAsapReadRequest > 0)
_bau.groupValueReadLocalConfirm(ack, _savedAsapReadRequest, priority, hopType, secCtrl, status); _bau.groupValueReadLocalConfirm(ack, _savedAsapReadRequest, priority, hopType, secCtrl, status);
else
println("dataGroupConfirm: APDU-Type GroupValueRead has _savedAsapReadRequest = 0");
_savedAsapReadRequest = 0;
break; break;
case GroupValueResponse: case GroupValueResponse:
if (_savedAsapResponse > 0)
_bau.groupValueReadResponseConfirm(ack, _savedAsapResponse, priority, hopType, secCtrl, apdu.data(), apdu.length() - 1, status); _bau.groupValueReadResponseConfirm(ack, _savedAsapResponse, priority, hopType, secCtrl, apdu.data(), apdu.length() - 1, status);
else
println("dataGroupConfirm: APDU-Type GroupValueResponse has _savedAsapResponse = 0");
_savedAsapResponse = 0;
break; break;
case GroupValueWrite: case GroupValueWrite:
if (_savedAsapWriteRequest > 0)
_bau.groupValueWriteLocalConfirm(ack, _savedAsapWriteRequest, priority, hopType, secCtrl, apdu.data(), apdu.length() - 1, status); _bau.groupValueWriteLocalConfirm(ack, _savedAsapWriteRequest, priority, hopType, secCtrl, apdu.data(), apdu.length() - 1, status);
else
println("dataGroupConfirm: APDU-Type GroupValueWrite has _savedAsapWriteRequest = 0");
_savedAsapWriteRequest = 0;
break; break;
default: default:
print("datagroup-confirm: unhandled APDU-Type: "); print("datagroup-confirm: unhandled APDU-Type: ");

6
src/knx/application_layer.h
View File

@ -202,9 +202,9 @@ class ApplicationLayer
void individualConfirm(AckType ack, HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu, const SecurityControl& secCtrl, bool status); void individualConfirm(AckType ack, HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu, const SecurityControl& secCtrl, bool status);
void individualSend(AckType ack, HopCountType hopType, Priority priority, uint16_t asap, APDU& apdu, const SecurityControl& secCtrl); void individualSend(AckType ack, HopCountType hopType, Priority priority, uint16_t asap, APDU& apdu, const SecurityControl& secCtrl);
uint16_t _savedAsapReadRequest; uint16_t _savedAsapReadRequest = 0;
uint16_t _savedAsapWriteRequest; uint16_t _savedAsapWriteRequest = 0;
uint16_t _savedAsapResponse; uint16_t _savedAsapResponse = 0;
AssociationTableObject* _assocTable = nullptr; AssociationTableObject* _assocTable = nullptr;
BusAccessUnit& _bau; BusAccessUnit& _bau;