commit a5de734d52f5afcef99facc25ee70d108d5bc140
author Manish Singh <psych@google.com> Fri Mar 05 22:34:33 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 05 22:34:33 2021 +0000
tree 84fff3dd9fa55a3224d6542afac60a78355629d2
parent ef8c152625fed8758e73cb681414b71cdd893ad3
parent 0ca4dd51fd50f0c62d477eef4e05a4456a15fdb1

Merge "Grant statsd pull atom permission" into mainline-prod

src/com/android/providers/media/util/IsoInterface.java

diff --git a/src/com/android/providers/media/util/IsoInterface.java b/src/com/android/providers/media/util/IsoInterface.java
index 5de4b6b..03b46c9 100644
--- a/src/com/android/providers/media/util/IsoInterface.java
+++ b/src/com/android/providers/media/util/IsoInterface.java
@@ -177,14 +177,25 @@
                 return null;
             }
 
-            box.data = new byte[(int) (len - box.headerSize)];
+            try {
+                box.data = new byte[(int) (len - box.headerSize)];
+            } catch (OutOfMemoryError e) {
+                Log.w(TAG, "Couldn't read large uuid box", e);
+                return null;
+            }
             Os.read(fd, box.data, 0, box.data.length);
         } else if (type == BOX_XMP) {
             if (len > Integer.MAX_VALUE) {
                 Log.w(TAG, "Skipping abnormally large xmp box");
                 return null;
             }
-            box.data = new byte[(int) (len - box.headerSize)];
+
+            try {
+                box.data = new byte[(int) (len - box.headerSize)];
+            } catch (OutOfMemoryError e) {
+                Log.w(TAG, "Couldn't read large xmp box", e);
+                return null;
+            }
             Os.read(fd, box.data, 0, box.data.length);
         } else if (type == BOX_META && len != headerSize) {
             // The format of this differs in ISO and QT encoding: