Fix wrong variable in findXmp XMP trailer search loop#9284
Open
MarkLee131 wants to merge 1 commit intoExiv2:mainfrom
Open
Fix wrong variable in findXmp XMP trailer search loop#9284MarkLee131 wants to merge 1 commit intoExiv2:mainfrom
MarkLee131 wants to merge 1 commit intoExiv2:mainfrom
Conversation
Line 182 checks data[xmpPos] instead of data[trailerPos]. The variable xmpPos is constant at this point, so the early-exit condition is never true. The loop checks every byte position against all XMP trailer patterns unnecessarily. Use data[trailerPos] to restore the intended early-exit behavior.
There was a problem hiding this comment.
Pull request overview
Fixes an incorrect buffer index used during XMP trailer scanning in findXmp(), restoring the intended early-exit optimization and avoiding unnecessary comparisons across the entire remaining buffer.
Changes:
- Correct the trailer pre-filter check to use
data[trailerPos]instead ofdata[xmpPos]inside the trailer search loop.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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
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.
Fix #9283:
Line 182 checks data[xmpPos] instead of data[trailerPos]. The variable xmpPos is constant at this point, so the early-exit condition is never true. The loop checks every byte position against all XMP trailer patterns unnecessarily.
Use data[trailerPos] to restore the intended early-exit behavior.