fix null pointer (#813)

Co-authored-by: liamcli <liamcli@tencent.com> (cherry picked from commit e4e1e4d)
Tencent · Mar 24, 2023 · 9bad3ba · 9bad3ba
1 parent f3eba48
commit 9bad3ba
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/android/libpag/src/main/java/org/libpag/PAGImageView.java b/android/libpag/src/main/java/org/libpag/PAGImageView.java
@@ -391,12 +391,10 @@ private float getAnimationScale(Context context) {
 
  private void refreshDecodeInfo() {
  if (decoderInfo != null) {
- decoderInfo.release();
- decoderInfo = null;
+ decoderInfo.reset();
  }
  releaseCurrentDiskCache();
  lastKeyItem = null;
- decoderInfo = new DecoderInfo();
  initDecoderInfo();
  }
 
@@ -614,7 +612,7 @@ protected void onDetachedFromWindow() {
  releaseCurrentDiskCache();
  renderBitmap = null;
  if (decoderInfo != null) {
- decoderInfo.release();
+ decoderInfo.reset();
  }
  bitmapCache.clear();
  }
@@ -747,7 +745,7 @@ private void releaseDecoder() {
  }
  cacheItem.writeLock();
  if (bitmapCache.size() == decoderInfo.numFrames || cacheItem.isAllCached()) {
- decoderInfo.release();
+ decoderInfo.releaseDecoder();
  cacheItem.releaseSaveBuffer();
  if (bitmapCache.size() == decoderInfo.numFrames) {
  cacheItem.release();

diff --git a/android/libpag/src/main/java/org/libpag/PAGImageViewHelper.java b/android/libpag/src/main/java/org/libpag/PAGImageViewHelper.java
@@ -338,11 +338,20 @@ boolean initDecoder(Context context, PAGComposition _composition,
  return true;
  }
 
- void release() {
+ void releaseDecoder() {
  if (_pagDecoder != null) {
  _pagDecoder.release();
  }
  _pagDecoder = null;
  }
+
+ void reset() {
+ releaseDecoder();
+ _width = 0;
+ _height = 0;
+ realFrameRate = 0;
+ numFrames = 0;
+ duration = 0;
+ }
  }
 }