Skip to content

fix: bounds checks for MaterialChunk shaderSize=0 and Ktx1Bundle constructor overflow #9879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mohammadmseet-hue wants to merge 1 commit into from
+7 −1
Closed

fix: bounds checks for MaterialChunk shaderSize=0 and Ktx1Bundle constructor overflow #9879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions libs/filaflat/src/MaterialChunk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ bool MaterialChunk::getTextShader(Unflattener unflattener,
if (!unflattener.read(&shaderSize)){
return false;
}
if (shaderSize == 0) {
return false;
}

// Read how many lines there are.
uint32_t lineCount = 0;
Expand Down
5 changes: 4 additions & 1 deletion libs/image/src/Ktx1Bundle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ Ktx1Bundle::Ktx1Bundle(uint32_t numMipLevels, uint32_t arrayLength, bool isCubem
mNumMipLevels = numMipLevels;
mArrayLength = arrayLength;
mNumCubeFaces = isCubemap ? 6 : 1;
mBlobs->sizes.resize(numMipLevels * arrayLength * mNumCubeFaces);
uint64_t const totalBlobs = (uint64_t)numMipLevels * arrayLength * mNumCubeFaces;
FILAMENT_CHECK_POSTCONDITION(totalBlobs <= (uint64_t)std::numeric_limits<uint32_t>::max())
<< "KTX dimensions overflow";
mBlobs->sizes.resize((uint32_t)totalBlobs);
}

Ktx1Bundle::Ktx1Bundle(uint8_t const* bytes, uint32_t nbytes) :
Expand Down