Prevent NPE in ImageLayer.getBounds() #2578
Merged
Conversation
This file contains 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
The recent [improvements to drop shadows](https://github.com/airbnb/lottie-android/pull/2548/files#diff-31e777f53a917d69dcf1b234ae6c77db843316c34911e200d0a9a160c058b621R110) added a dereference of a nullable result from the `getBitmap()` call.
|
Full stacktrace for reference: |
gpeal
reviewed
Nov 16, 2024
| @@ -107,7 +107,10 @@ public class ImageLayer extends BaseLayer { | |||
| if (lottieDrawable.getMaintainOriginalImageBounds()) { | |||
| outBounds.set(0, 0, lottieImageAsset.getWidth() * scale, lottieImageAsset.getHeight() * scale); | |||
| } else { | |||
| outBounds.set(0, 0, getBitmap().getWidth() * scale, getBitmap().getHeight() * scale); | |||
| Bitmap bitmap = getBitmap(); | |||
| if (bitmap != null) { | |||
There was a problem hiding this comment.
What happens if this is null? Will outBounds potentially have a stale value from another frame?
There was a problem hiding this comment.
@gpeal I don't have the full context here so maybe @geomaster can chime in on what scenarios would cause the bitmap to be null and whether we need alternate behavior around updating outBounds.
There was a problem hiding this comment.
Unfortunately I'm not sure why the bitmap would be null - presumably, it has not loaded yet, or it didn't load correctly?
If the bitmap is null, we would be rendering nothing, so I think arguably the correct thing to do is simply to set to an empty rectangle, with outBounds.set(0, 0, 0, 0).
Thoughts?
There was a problem hiding this comment.
@geomaster @allenchen1154 do either of you want to take this across the finish line?
There was a problem hiding this comment.
@gpeal I've updated the else case as @geomaster recommended - PTAL.
gpeal
approved these changes
Mar 4, 2025
allenchen1154
added a commit
to allenchen1154/lottie-android
that referenced
this pull request
Mar 19, 2025
The changes in airbnb#2578 set the bounds returned by `ImageLayer.getBounds()` to have 0 width and 0 height if there is no Bitmap available. This change instead calls the previous version of the logic which reads the width and height of the `LottieImageAsset`.
gpeal
pushed a commit
that referenced
this pull request
Mar 20, 2025
The changes in #2578 set the bounds returned by `ImageLayer.getBounds()` to have 0 width and 0 height if there is no Bitmap available. This change instead calls the previous version of the logic which reads the width and height of the `LottieImageAsset`.
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.
The recent improvements to drop shadows added a dereference of a nullable result from the
getBitmap()call.Fixes #2601