Commit 77f55e21 authored Apr 28, 2021 by Treehugger Robot Committed by Automerger Merge Worker Apr 28, 2021

Merge "libdatasource: fix null dereference" am: 0aef3ff4

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1686466

Change-Id: Ibc400f27ef5c853977d002a7037b4ed12d23bd92

media/libdatasource/DataSourceFactory.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,9 @@ sp<DataSource> DataSourceFactory::CreateFromURI(
		sp<HTTPBase> mediaHTTP = httpSource;
		if (mediaHTTP == NULL) {
		mediaHTTP = static_cast<HTTPBase *>(CreateMediaHTTP(httpService).get());
		if (mediaHTTP == NULL) {
		return NULL;
		}
		}

		String8 cacheConfig;