From 169c286ed166499c5099d2b336967e0bf3d25551 Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Wed, 17 Aug 2011 13:03:51 -0700
Subject: Make sure we have all the sample table metadata before declaring a
 track valid.

Change-Id: I2dfbc3e6017b5cd264e4cccfa47d19047b2e7f31
related-to-bug: 5178976
---
 media/libstagefright/MPEG4Extractor.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'media/libstagefright/MPEG4Extractor.cpp')

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 73a05a5..3b79f06 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1687,6 +1687,11 @@ status_t MPEG4Extractor::verifyTrack(Track *track) {
         }
     }
 
+    if (!track->sampleTable->isValid()) {
+        // Make sure we have all the metadata we need.
+        return ERROR_MALFORMED;
+    }
+
     return OK;
 }
 
-- 
cgit v1.1