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

Try fixing a crash due to NULL derefence (#77)

Browse Source 
* fix crash due to NULL _sendBuffer

Co-authored-by: etrinh <etrinh@zdionline.net>
This commit is contained in:
etrinh 2020-07-19 13:37:42 +02:00 committed by GitHub
parent ffea53614b
commit 52d3866e41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/knx/memory.cpp
View File

@ -2,6 +2,10 @@
#include <string.h> #include <string.h>
#include "bits.h" #include "bits.h"
#ifndef KNX_FLASH_SIZE
# define KNX_FLASH_SIZE 8192
#endif
Memory::Memory(Platform& platform, DeviceObject& deviceObject) Memory::Memory(Platform& platform, DeviceObject& deviceObject)
: _platform(platform), _deviceObject(deviceObject) : _platform(platform), _deviceObject(deviceObject)
{ {
@ -13,7 +17,7 @@ void Memory::readMemory()
if (_data != nullptr) if (_data != nullptr)
return; return;
uint16_t flashSize = 8192; uint16_t flashSize = KNX_FLASH_SIZE;
_data = _platform.getEepromBuffer(flashSize); _data = _platform.getEepromBuffer(flashSize);
printHex("RESTORED ", _data, _metadataSize); printHex("RESTORED ", _data, _metadataSize);

2
src/knx/tpuart_data_link_layer.cpp
View File

@ -245,7 +245,7 @@ void TpUartDataLinkLayer::loop()
//Destination Address + payload available //Destination Address + payload available
_xorSum ^= rxByte; _xorSum ^= rxByte;
//check if echo //check if echo
if (!((buffer[0] ^ _sendBuffer[0]) & ~0x20) && !memcmp(buffer + _convert + 1, _sendBuffer + 1, 5)) if (_sendBuffer != nullptr && (!((buffer[0] ^ _sendBuffer[0]) & ~0x20) && !memcmp(buffer + _convert + 1, _sendBuffer + 1, 5)))
{ //ignore repeated bit of control byte { //ignore repeated bit of control byte
_isEcho = true; _isEcho = true;
} }