Skip to content

Avoid shifting by 32 or more in interpretDFD #32

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

Merged
MarkCallow merged 1 commit into from
Oct 29, 2026
Merged

Avoid shifting by 32 or more in interpretDFD #32

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
6 changes: 5 additions & 1 deletion interpretdfd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,11 @@ enum InterpretDFDResult interpretDFD(const uint32_t *DFD,
isFixed = false;
} else {
uint32_t sampleUpper = KHR_DFDSVAL(BDFDB, i, SAMPLEUPPER);
uint32_t maxVal = 1U << KHR_DFDSVAL(BDFDB, i, BITLENGTH);
// sampleUpper of a longer sample is extended per the spec, which
// gives the same comparison result as 32 bits.
uint32_t bitLength = KHR_DFDSVAL(BDFDB, i, BITLENGTH) + 1;
if (bitLength > 32) bitLength = 32;
uint32_t maxVal = 1U << (bitLength - 1);
if (!isSigned) maxVal <<= 1;
maxVal--;
isFixed = 1U < sampleUpper && sampleUpper < maxVal;
Expand Down
Loading