Handle StackOverflowErrors associated with ExifInterface

android.support.media.ExifInterface.readImageFileDirectory (ExifInterface.java:2618) android.support.media.ExifInterface.readImageFileDirectory (ExifInterface.java:2795) android.support.media.ExifInterface.readImageFileDirectory (ExifInterface.java:2795) android.support.media.ExifInterface.readImageFileDirectory (ExifInterface.java:2795)
muzei · Jan 28, 2017 · 965814c · 965814c
1 parent 2b9d4c1
commit 965814c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/main/src/main/java/com/google/android/apps/muzei/render/RealRenderController.java b/main/src/main/java/com/google/android/apps/muzei/render/RealRenderController.java
@@ -71,7 +71,7 @@ protected BitmapRegionLoader openDownloadedCurrentArtwork(boolean forceReload) {
                     case ExifInterface.ORIENTATION_ROTATE_180: rotation = 180; break;
                     case ExifInterface.ORIENTATION_ROTATE_270: rotation = 270; break;
                 }
-            } catch (IOException e) {
+            } catch (IOException|StackOverflowError e) {
                 Log.w(TAG, "Couldn't open EXIF interface on artwork", e);
             }
             return BitmapRegionLoader.newInstance(

diff --git a/main/src/main/java/com/google/android/apps/muzei/wearable/WearableController.java b/main/src/main/java/com/google/android/apps/muzei/wearable/WearableController.java
@@ -117,7 +117,7 @@ private static int getRotation(Context context) {
                 case ExifInterface.ORIENTATION_ROTATE_180: rotation = 180; break;
                 case ExifInterface.ORIENTATION_ROTATE_270: rotation = 270; break;
             }
-        } catch (IOException ignored) {
+        } catch (IOException|StackOverflowError ignored) {
         }
         return rotation;
     }

diff --git a/source-gallery/src/main/java/com/google/android/apps/muzei/gallery/GalleryArtSource.java b/source-gallery/src/main/java/com/google/android/apps/muzei/gallery/GalleryArtSource.java
@@ -439,7 +439,7 @@ private void ensureMetadataExists(@NonNull Uri imageUri) {
                 }
 
                 getContentResolver().insert(GalleryContract.MetadataCache.CONTENT_URI, values);
-            } catch (ParseException|IOException e) {
+            } catch (ParseException|IOException|StackOverflowError e) {
                 Log.w(TAG, "Couldn't read image metadata.", e);
             }
         }