commit 0aef3ff448884573065eb31490284afaf86e09be
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 28 19:20:36 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 28 19:20:36 2021 +0000
tree ea880e7784c95af169986fc3b78a1bfe51de403c
parent 11ff74e46a9e03b7e84d5427b39696ecc766d85f
parent 980bdf2b9f86f2ad0977713363ece5bee719dccc

Merge "libdatasource: fix null dereference"

media/libdatasource/DataSourceFactory.cpp

diff --git a/media/libdatasource/DataSourceFactory.cpp b/media/libdatasource/DataSourceFactory.cpp
index bb6a08c..f91e3ea 100644
--- a/media/libdatasource/DataSourceFactory.cpp
+++ b/media/libdatasource/DataSourceFactory.cpp
@@ -65,6 +65,9 @@
         sp<HTTPBase> mediaHTTP = httpSource;
         if (mediaHTTP == NULL) {
             mediaHTTP = static_cast<HTTPBase *>(CreateMediaHTTP(httpService).get());
+            if (mediaHTTP == NULL) {
+                return NULL;
+            }
         }
 
         String8 cacheConfig;