Fix undefined behavior in texture bit-field parsing from untrusted input#2341
Open
SABITHSAHEB wants to merge 1 commit into
Open
Fix undefined behavior in texture bit-field parsing from untrusted input#2341SABITHSAHEB wants to merge 1 commit into
SABITHSAHEB wants to merge 1 commit into
Conversation
Author
|
Any Updates on this pr? |
This file contains hidden or 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
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.
Description
While reviewing the texture painting code, I noticed that bit ranges for paint features are read from PNG
Descriptionmetadata and used directly for bit extraction.Since these values originate from untrusted PNG files or Arcus messages, invalid ranges such as
end >= 32orstart > endcan result in out-of-range shift operations inTextureDataProvider::getValue, leading to undefined behavior.Changes
Added
TextureBitField::isValid()to enforce:start <= endend < 32Validate bit ranges while parsing JSON metadata in
loadTextureFromPngData.Added a defensive validation check in
TextureDataProvider::getValue.Verify JSON values are unsigned integers before calling
GetUint().Invalid metadata is now logged and skipped instead of being processed.
Testing
Added
TextureDataProviderTest.cppcovering:Valid bit ranges continue to extract the expected values.
Invalid ranges such as:
[0,32][0,64][10,5]are rejected safely.
Confirmed that valid textures behave exactly as before and only malformed metadata is ignored.