Handle MOV sample descriptions entry count bounds

Contributes to #561
drewnoakes · Apr 3, 2022 · 537132e · 537132e
1 parent 7ae0389
commit 537132e
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/Source/com/drew/metadata/mov/atoms/SampleDescriptionAtom.java b/Source/com/drew/metadata/mov/atoms/SampleDescriptionAtom.java
@@ -33,17 +33,24 @@
  */
 public abstract class SampleDescriptionAtom<T extends SampleDescription> extends FullAtom
 {
-    long numberOfEntries;
-    ArrayList<T> sampleDescriptions;
+    protected long numberOfEntries;
+    protected ArrayList<T> sampleDescriptions;
 
     public SampleDescriptionAtom(SequentialReader reader, Atom atom) throws IOException
     {
         super(reader, atom);
 
         numberOfEntries = reader.getUInt32();
-        sampleDescriptions = new ArrayList<T>((int)numberOfEntries);
-        for (int i = 0; i < numberOfEntries; i++) {
-            sampleDescriptions.add(getSampleDescription(reader));
+
+        if (numberOfEntries <= Integer.MAX_VALUE) {
+            sampleDescriptions = new ArrayList<T>((int)numberOfEntries);
+            for (long i = 0; i < numberOfEntries; i++) {
+                sampleDescriptions.add(getSampleDescription(reader));
+            }
+        } else {
+            // TODO surface an error here
+            numberOfEntries = 0;
+            sampleDescriptions = new ArrayList<T>();
         }
     }