fix: avoid erroring out on corrupt image data #2524
Merged
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.
Fixes #2257
Fixes #2235
As an aside, we should consider switching from using
getimagesizefromstring()
togetimagesize()
if we can -- it consumes far less memory in my testing (presumably since the entire image isn't loaded into a string in memory).P.S. Technically this also addresses the logging side of #2259, but it's unclear whether that's arising from a memory limit or what. I can only get that error if I feed
getimagesizefromstring()
/dev/null
. :-) However this PR does add logging of the path so it'll likely help work out that issue as well.