reject undersized payload in load_ktx_compressed_image#658
Open
sahvx655-wq wants to merge 1 commit into
Open
Conversation
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.
load_ktx_compressed_imagereads the KTXimageSizefield as the compressed payload length and reads the pixel dimensions from separate header fields, but never checks the two agree. A crafted.ktxcan declare dimensions spanning many blocks while carrying a payload sized for far fewer, so the loader hands back anastc_compressed_imagewhosedatabuffer is smaller than its own dimensions imply. I noticed this comparing the KTX path withload_cimage, which sizes the payload from the dimensions and so cannot store an inconsistent pair.The change derives the block count from the dimensions and the format block footprint with
astc::mul_safeand rejects the file whenimageSizecannot cover it, matching howload_cimagesizes its own payload.astcenc_decompress_imagealready re-checks the length before its block loop, so a plain-dldecode was refused either way, butprint_diagnostic_imagewalksblock_cols * block_rowsblocks straight out of the payload with no length check of its own; validating in the loader keeps every consumer working from a consistent object instead of re-deriving the bound.