Fix array overflow in exploding_fireworks #4289
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Attempt to allocate enough room for the "minimum" sparks; and ensure that we never overrun the allocated array size. Fixes Aircoookie#4120
DedeHai
approved these changes
Nov 17, 2024
blazoncek
reviewed
Nov 19, 2024
| @@ -3547,7 +3547,7 @@ uint16_t mode_exploding_fireworks(void) | |||
| if (segs <= (strip.getMaxSegments() /4)) maxData *= 2; //ESP8266: 1024 if <= 4 segs ESP32: 2560 if <= 8 segs | |||
| int maxSparks = maxData / sizeof(spark); //ESP8266: max. 21/42/85 sparks/seg, ESP32: max. 53/106/213 sparks/seg | |||
|
|
|||
| unsigned numSparks = min(2 + ((rows*cols) >> 1), maxSparks); | |||
| unsigned numSparks = min(5 + ((rows*cols) >> 1), maxSparks); | |||
There was a problem hiding this comment.
This change alone would be sufficient IMO. It will guarantee that minimum size is 5
There was a problem hiding this comment.
True. I do prefer to be absolutely explicit at the point of usage as well, though - it's saved me a couple times as I don't always remember the subtle relationships between static constants in future refactors.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Attempt to allocate enough room for the "minimum" sparks; and ensure that we never overrun the allocated array size.
Fixes #4120