From cc5cfd46c01afda58b43d0e5b8982ddacbd3a6e8 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 21 Aug 2017 07:26:50 -0700
Subject: [PATCH] Handle size==0 in MP4 atoms

Issue: #3191

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165925148
---
 .../mp4/sample_fragmented_zero_size_atom.mp4  | Bin 1903 -> 0 bytes
 .../mp4/FragmentedMp4ExtractorTest.java       |   6 ------
 .../exoplayer2/extractor/mp4/Atom.java        |   9 +++++++--
 .../extractor/mp4/FragmentedMp4Extractor.java |  14 ++++++++++++--
 .../extractor/mp4/Mp4Extractor.java           |  18 ++++++++++++++++--
 .../exoplayer2/extractor/mp4/Sniffer.java     |   9 ++++++++-
 6 files changed, 43 insertions(+), 13 deletions(-)
 delete mode 100644 library/core/src/androidTest/assets/mp4/sample_fragmented_zero_size_atom.mp4

diff --git a/library/core/src/androidTest/assets/mp4/sample_fragmented_zero_size_atom.mp4 b/library/core/src/androidTest/assets/mp4/sample_fragmented_zero_size_atom.mp4
deleted file mode 100644
index 3d3c63786ef7f40a9b4307fd17fcdc47f006f350..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1903
zcmb_cO-NKx6h3!;RP4t|4V9wCw3TEk7PhDcl$s#0h$JG&mv1H~=lSHlH$z4XsZ9h$
zl#3QcK~O}tX<>`XBKmKUB`u0t^dl4!Ve7)abMLizjTtSv%=gaEcka3Oo^$UIQ8elG
z_oZChA_@>opvlN~HClbmjYOfFmThN=C~alCO-LGZ-LDLy;3u|8$e&cF?VO=_za8@%
zGxY#ml_}eFnTiYy3=~rP6c4QO)^m&=xOaIyaxW#hz3?uGR2*x*A(`3j7^qMSPCv>q
zqTe!829&5}=ASpy!1=e|<2YK;ZKfTm;ge07iD{i>2W&fT^qT1e$B0@h)tiJ;p0#9B
z|CVY^#Vt0S1jq1Tes0D|N45UZ_4cHppLRW0HbMK3aHF8}@aL3{Pz#O}hsxkFBSN`-
z-%2hsar;|^NlT~RQPp0^p;xiC@W^fvAzF8W=3k`A!&RMv3c4pgJY9ANGa|0%$%g4%
zu-z`LvnYpsz-P0Hm@Yf#6IcGyT)q_f%@y)E`De<rW4Q&OiH);2cc^W)=DK#K*Pmt^
zY%|wf`lg#3aaD7tWB;YG!@9Bi@*2Anug}nlaz_dfIzTkkCYjX<SG|%TUdeL2-VkI(
zY$21uc`+7Yc*3Pc9ph90O>i0iL#rrmWfS|6E9yB?@>0CZ+)ml^JI`z9^PL&fGvME0
zC8Xpz)&6&db~#30A7A}nqb`+pJy<oDJ)7^(BGZtQW%A8NHo2;~zNw+U8814H|1N$~
z5i6<QGIWHAW?VJ)*LupoM)~oj&>Ix*GtuC%zF$S2!|g8)gIt1~TjX5?PgM8<M;s(7
zJBCV^C|kVbEQrJUoTuW3;)Cs)f2epdruYT-6(3r!`GcBA9M3P`p!t=G4`3}GVqEcM
z<vKrX-cMja(j+DnKj*6Ekw@}T&2LhC_>1Oi^!n#C56SBX@PEtm==&dPrb;1e7UF58
z+A*qX7T}uIli2!0`%7VSAmc2~fWHip0Zsxqueb)>1+Zr+Z$mx?SUv)d1FwPezykn1
z5U8&>1H1<g0ndP=0QN3U0X+9Q!2V0XBya)XJiLcn0D2IphFl9-1^EPc4vb)*#Q<5j
iV-T%Y(&77B=RwN*h9KrKrlqn_6Cp1UuAXCSU+Yh^T`VF1

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
index 76c13495c1..c9364aa605 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.extractor.mp4;
 
 import android.test.InstrumentationTestCase;
-import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
@@ -38,11 +37,6 @@ public final class FragmentedMp4ExtractorTest extends InstrumentationTestCase {
         "mp4/sample_fragmented_sei.mp4", getInstrumentation());
   }
 
-  public void testAtomWithZeroSize() throws Exception {
-    ExtractorAsserts.assertThrows(getExtractorFactory(), "mp4/sample_fragmented_zero_size_atom.mp4",
-        getInstrumentation(), ParserException.class);
-  }
-
   private static ExtractorFactory getExtractorFactory() {
     return getExtractorFactory(0);
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
index cc7e662336..21d861af30 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
@@ -39,9 +39,14 @@ import java.util.List;
   public static final int LONG_HEADER_SIZE = 16;
 
   /**
-   * Value for the first 32 bits of atomSize when the atom size is actually a long value.
+   * Value for the size field in an atom that defines its size in the largesize field.
    */
-  public static final int LONG_SIZE_PREFIX = 1;
+  public static final int DEFINES_LARGE_SIZE = 1;
+
+  /**
+   * Value for the size field in an atom that extends to the end of the file.
+   */
+  public static final int EXTENDS_TO_END_SIZE = 0;
 
   public static final int TYPE_ftyp = Util.getIntegerCodeForString("ftyp");
   public static final int TYPE_avc1 = Util.getIntegerCodeForString("avc1");
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
index 6b2077ef76..c3f2a9fb38 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
@@ -283,12 +283,22 @@ public final class FragmentedMp4Extractor implements Extractor {
       atomType = atomHeader.readInt();
     }
 
-    if (atomSize == Atom.LONG_SIZE_PREFIX) {
-      // Read the extended atom size.
+    if (atomSize == Atom.DEFINES_LARGE_SIZE) {
+      // Read the large size.
       int headerBytesRemaining = Atom.LONG_HEADER_SIZE - Atom.HEADER_SIZE;
       input.readFully(atomHeader.data, Atom.HEADER_SIZE, headerBytesRemaining);
       atomHeaderBytesRead += headerBytesRemaining;
       atomSize = atomHeader.readUnsignedLongToLong();
+    } else if (atomSize == Atom.EXTENDS_TO_END_SIZE) {
+      // The atom extends to the end of the file. Note that if the atom is within a container we can
+      // work out its size even if the input length is unknown.
+      long endPosition = input.getLength();
+      if (endPosition == C.LENGTH_UNSET && !containerAtoms.isEmpty()) {
+        endPosition = containerAtoms.peek().endPosition;
+      }
+      if (endPosition != C.LENGTH_UNSET) {
+        atomSize = endPosition - input.getPosition() + atomHeaderBytesRead;
+      }
     }
 
     if (atomSize < atomHeaderBytesRead) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
index d0e770abdc..d3fe9e0d05 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -205,12 +205,26 @@ public final class Mp4Extractor implements Extractor, SeekMap {
       atomType = atomHeader.readInt();
     }
 
-    if (atomSize == Atom.LONG_SIZE_PREFIX) {
-      // Read the extended atom size.
+    if (atomSize == Atom.DEFINES_LARGE_SIZE) {
+      // Read the large size.
       int headerBytesRemaining = Atom.LONG_HEADER_SIZE - Atom.HEADER_SIZE;
       input.readFully(atomHeader.data, Atom.HEADER_SIZE, headerBytesRemaining);
       atomHeaderBytesRead += headerBytesRemaining;
       atomSize = atomHeader.readUnsignedLongToLong();
+    } else if (atomSize == Atom.EXTENDS_TO_END_SIZE) {
+      // The atom extends to the end of the file. Note that if the atom is within a container we can
+      // work out its size even if the input length is unknown.
+      long endPosition = input.getLength();
+      if (endPosition == C.LENGTH_UNSET && !containerAtoms.isEmpty()) {
+        endPosition = containerAtoms.peek().endPosition;
+      }
+      if (endPosition != C.LENGTH_UNSET) {
+        atomSize = endPosition - input.getPosition() + atomHeaderBytesRead;
+      }
+    }
+
+    if (atomSize < atomHeaderBytesRead) {
+      throw new ParserException("Atom size less than header length (unsupported).");
     }
 
     if (shouldParseContainerAtom(atomType)) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
index 44d5824945..021c9de654 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
@@ -104,11 +104,18 @@ import java.io.IOException;
       input.peekFully(buffer.data, 0, headerSize);
       long atomSize = buffer.readUnsignedInt();
       int atomType = buffer.readInt();
-      if (atomSize == Atom.LONG_SIZE_PREFIX) {
+      if (atomSize == Atom.DEFINES_LARGE_SIZE) {
+        // Read the large atom size.
         headerSize = Atom.LONG_HEADER_SIZE;
         input.peekFully(buffer.data, Atom.HEADER_SIZE, Atom.LONG_HEADER_SIZE - Atom.HEADER_SIZE);
         buffer.setLimit(Atom.LONG_HEADER_SIZE);
         atomSize = buffer.readUnsignedLongToLong();
+      } else if (atomSize == Atom.EXTENDS_TO_END_SIZE) {
+        // The atom extends to the end of the file.
+        long endPosition = input.getLength();
+        if (endPosition != C.LENGTH_UNSET) {
+          atomSize = endPosition - input.getPosition() + headerSize;
+        }
       }
 
       if (atomSize < headerSize) {