Cleanup exif checks #10402
Closed
Cleanup exif checks #10402
+0
−11
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
This condition will never trigger because otherwise the do-while loop wouldn't have exited.
|
nice catches ! |
devnexen
reviewed
Jan 21, 2023
| @@ -3810,12 +3805,6 @@ static bool exif_scan_JPEG_header(image_info_type *ImageInfo) | |||
|
|
|||
| fpos = php_stream_tell(ImageInfo->infile); | |||
|
|
|||
| if (marker == 0xff) { | |||
There was a problem hiding this comment.
could it be still somewhat useful (e.g. fuzzing) ?
There was a problem hiding this comment.
I don't understand your question. This check can never be hit because of the do-while loop: if we get here marker must be !=0xff. Unless this code was meant to check in a different way?
There was a problem hiding this comment.
nevermind I misread the code it s clearer when unfolded.
There was a problem hiding this comment.
It might be a good idea to replace that with a ZEND_ASSERT(), so it's easier to understand (and to also have a safeguard just in case the code above would be modified).
TimWolla
approved these changes
Jan 21, 2023
|
Thanks! |
devnexen
added a commit
to devnexen/php-src
that referenced
this pull request
Jan 22, 2023
more in a context of a possible text change. follow-up on phpGH-10402.
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.
Gets rid of two redundant checks.