ext/exif: spell the Exif identifier code as a char literal#22241
Merged
Conversation
The {0x45, 0x78, 0x69, 0x66, 0x00, 0x00} arrays are the ASCII bytes for
"Exif\0\0"; the char form is byte-identical and self-documenting.
LamentXU123
approved these changes
Jun 7, 2026
Contributor
|
LGTM but may still need to wait for Gina's opinion :) |
TimWolla
reviewed
Jun 13, 2026
| { | ||
| /* Check the APP1 for Exif Identifier Code */ | ||
| static const uchar ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00}; | ||
| static const uchar ExifHeader[] = {'E', 'x', 'i', 'f', 0, 0}; |
Member
There was a problem hiding this comment.
Can't this just be "Exif\x00\x00" directly in the memcmp()?
Contributor
Author
There was a problem hiding this comment.
Yes for this one, but the HEIF check in exif_scan_HEIF_header() uses sizeof(ExifHeader) for both the compare length and the skip offset, so it needs the named array there. Kept this site matching it rather than splitting the style across the two.
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
4 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.
Follow-up to the review on #22213: replace the
{0x45, 0x78, 0x69, 0x66, 0x00, 0x00}byte arrays for the Exif identifier with the equivalent{'E', 'x', 'i', 'f', 0, 0}in both the APP1 and WebP checks. Byte-identical, just more readable.P.S. I looked at the other suggestion (endian) rename but the delta was way too big, so decided to leave it be for now.