read.c: Clamp CICP enum values to valid range #2137
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
If invalid values are seen, replace them with UNSPECIFIED. This change does not affect the color conversion paths in anyway, it just changes what is reported in the public API.
y-guyon
approved these changes
Apr 26, 2024
| AVIF_CHECK(avifROStreamReadU16(&s, &colr->colorPrimaries)); // unsigned int(16) colour_primaries; | ||
| if (colr->colorPrimaries == 3 || | ||
| (colr->colorPrimaries > AVIF_COLOR_PRIMARIES_DCI_P3 && colr->colorPrimaries < AVIF_COLOR_PRIMARIES_EBU3213) || | ||
| colr->colorPrimaries > AVIF_COLOR_PRIMARIES_EBU3213) { |
There was a problem hiding this comment.
Consider adding AVIF_COLOR_PRIMARIES_LAST too
There was a problem hiding this comment.
yeah i considered it but decided not to do it because it's not very useful here since there are other holes in the range anwyays. so the check won't be simple.
i also didn't wanna update the pubic ABI simply for such a corner case check. if you strongly feel otherwise please let me know and i can add it.
wantehchang
reviewed
May 3, 2024
| AVIF_CHECK(avifROStreamReadU16(&s, &colr->matrixCoefficients)); // unsigned int(16) matrix_coefficients; | ||
| if (colr->matrixCoefficients == 3 || colr->matrixCoefficients >= AVIF_MATRIX_COEFFICIENTS_LAST) { | ||
| colr->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_UNSPECIFIED; | ||
| } |
There was a problem hiding this comment.
I am afraid that this pull request and the subsequent #2139 should be reverted. The reserved values may become valid in the future. The decoder should report the reserved values faithfully.
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.
If invalid values are seen, replace them with UNSPECIFIED. This
change does not affect the color conversion paths in anyway, it just
changes what is reported in the public API.