Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

safeguards against array bounds violation

Browse Source
This commit is contained in:
Frank
2026-01-25 15:43:53 +01:00
parent 900178cd70
commit fb738883fa
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wled00/src/dependencies/dmx/SparkFunDMX.cpp
View File

@@ -124,6 +124,7 @@ void SparkFunDMX::initWrite (int chanQuant) {
// Function to read DMX data // Function to read DMX data
uint8_t SparkFunDMX::read(int Channel) { uint8_t SparkFunDMX::read(int Channel) {
if (Channel > chanSize) Channel = chanSize; if (Channel > chanSize) Channel = chanSize;
if ((Channel > dmxMaxChannel) || (Channel < 1)) return 0; // WLEDMM prevent array out-of-bounds access
return(dmxData[Channel - 1]); //subtract one to account for start byte return(dmxData[Channel - 1]); //subtract one to account for start byte
} }
#endif #endif
@@ -132,6 +133,7 @@ uint8_t SparkFunDMX::read(int Channel) {
void SparkFunDMX::write(int Channel, uint8_t value) { void SparkFunDMX::write(int Channel, uint8_t value) {
if (Channel < 0) Channel = 0; if (Channel < 0) Channel = 0;
if (Channel > chanSize) chanSize = Channel; if (Channel > chanSize) chanSize = Channel;
if (Channel > dmxMaxChannel) Channel = dmxMaxChannel; // WLEDMM prevent array out-of-bounds access
dmxData[0] = 0; dmxData[0] = 0;
dmxData[Channel] = value; //add one to account for start byte dmxData[Channel] = value; //add one to account for start byte
} }
@@ -151,7 +153,7 @@ void SparkFunDMX::update() {
//Send DMX data //Send DMX data
DMXSerial.begin(DMXSPEED, DMXFORMAT, rxPin, txPin);//Begin the Serial port DMXSerial.begin(DMXSPEED, DMXFORMAT, rxPin, txPin);//Begin the Serial port
DMXSerial.write(dmxData, chanSize); DMXSerial.write(dmxData, min(dmxMaxChannel, chanSize));
DMXSerial.flush(); DMXSerial.flush();
DMXSerial.end();//clear our DMX array, end the Hardware Serial port DMXSerial.end();//clear our DMX array, end the Hardware Serial port
} }
@@ -162,9 +164,11 @@ void SparkFunDMX::update() {
{ {
while (DMXSerial.available()) while (DMXSerial.available())
{ {
dmxData[currentChannel++] = DMXSerial.read(); uint8_t newdata = DMXSerial.read();
if (currentChannel <= dmxMaxChannel)
dmxData[currentChannel++] = newdata;
} }
if (currentChannel > chanSize) //Set the channel counter back to 0 if we reach the known end size of our packet if ((currentChannel > chanSize) || (currentChannel > dmxMaxChannel)) //Set the channel counter back to 0 if we reach the known end size of our packet
{ {
portENTER_CRITICAL(&timerMux); portENTER_CRITICAL(&timerMux);