commit | b2a7ed2e9d10d3aa277b0457a2601c99217e273f | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Fri Jan 18 10:34:03 2019 -0800 |
committer | Marco Nelissen <marcone@google.com> | Fri Jan 18 10:34:03 2019 -0800 |
tree | b2775d1fca12ead36f594ab516215baf6e0856e4 | |
parent | 0e7fbcb161e2e806ffb2f321cd14e92924463ec2 [diff] [blame] |
Fix test failures Bug: 123077756 Test: CTS Change-Id: I2b440fef382bd7a6b5d956defd7715ec614f8d31
diff --git a/include/media/MediaExtractorPluginHelper.h b/include/media/MediaExtractorPluginHelper.h index f4d4da6..b86f177 100644 --- a/include/media/MediaExtractorPluginHelper.h +++ b/include/media/MediaExtractorPluginHelper.h
@@ -171,6 +171,9 @@ }; inline CMediaTrack *wrap(MediaTrackHelper *track) { + if (track == nullptr) { + return nullptr; + } CMediaTrack *wrapper = (CMediaTrack*) malloc(sizeof(CMediaTrack)); wrapper->data = track; wrapper->free = [](void *data) -> void {