Ensure gainmapItemCodecConfigSize 0 if data size 0 #2947
Merged
+2
−2
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
Ensure that gainmapItemCodecConfigSize is 0 if gainmapItemDataSize is 0. This matches the similar code for the alpha item. Change a "gainmapItemDataSize > 0" to "gainmapItemDataSize != 0" for consistency. This is just a cosmetic change. Bug: b:472695059
wantehchang
commented
Jan 3, 2026
| } | ||
| avifCodecConfigurationBox gainmapItemCodecConfig = { 0 }; | ||
| if (hasHdr && hasGainmap) { | ||
| if (hasHdr && hasGainmap && gainmapItemDataSize != 0) { |
Collaborator
Author
There was a problem hiding this comment.
The similar code for the alpha item is right above, at lines 4288-4298.
avifCodecConfigurationBox alphaItemCodecConfig = { 0 };
if (hasAlpha && alphaItemDataSize != 0) {
if (alphaItemCodecConfigSize == 0) {
alphaItemCodecConfigSize = mainItemCodecConfigSize;
alphaItemCodecConfig = mainItemCodecConfig;
} else {
AVIF_CHECKERR(alphaItemCodecConfigSize == 4, AVIF_RESULT_BMFF_PARSE_FAILED);
AVIF_CHECKERR(avifParseCodecConfiguration(&s, &alphaItemCodecConfig, (const char *)codecConfigType, diag),
AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(8) alpha_item_codec_config[alpha_item_codec_config_size];
}
}
Note that the conditional expression in line 4289 has && alphaItemDataSize != 0. This is why I added && gainmapItemDataSize != 0 here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Ensure that gainmapItemCodecConfigSize is 0 if gainmapItemDataSize is 0. This matches the similar code for the alpha item.
Change a "gainmapItemDataSize > 0" to "gainmapItemDataSize != 0" for consistency. This is just a cosmetic change.
Bug: b:472695059