From e4cfcb82a86e1546474c3fd25101ab561063a1bd Mon Sep 17 00:00:00 2001
From: James Dong <jdong@google.com>
Date: Thu, 4 Feb 2010 18:08:06 -0800
Subject: When the extractor is not able to be created successfully, don't
 crash

---
 cmds/stagefright/record.cpp      | 3 +++
 cmds/stagefright/stagefright.cpp | 4 ++++
 2 files changed, 7 insertions(+)

(limited to 'cmds')

diff --git a/cmds/stagefright/record.cpp b/cmds/stagefright/record.cpp
index 2ec0b70..845c854 100644
--- a/cmds/stagefright/record.cpp
+++ b/cmds/stagefright/record.cpp
@@ -106,6 +106,9 @@ sp<MediaSource> createSource(const char *filename) {
 
     sp<MediaExtractor> extractor =
         MediaExtractor::Create(new FileSource(filename));
+    if (extractor == NULL) {
+        return NULL;
+    }
 
     size_t num_tracks = extractor->countTracks();
 
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index e65cdf1..f7cb227 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -431,6 +431,10 @@ int main(int argc, char **argv) {
             mediaSource = new JPEGSource(dataSource);
         } else {
             sp<MediaExtractor> extractor = MediaExtractor::Create(dataSource);
+            if (extractor == NULL) {
+                fprintf(stderr, "could not create data source\n");
+                return -1;
+            }
 
             size_t numTracks = extractor->countTracks();
 
-- 
cgit v1.1