commit ebb1475d1a97ee3dbf25ea72383a6b7554aac1dd
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 10 03:15:06 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 10 03:15:08 2017 +0000
tree ad3ef7fb20af4384981b10aeecdc674959ea98d2
parent b81da0bd69fb703585f5601b9e712068fff6b4e9
parent 5c7ade853642a8e9414e5c69fdc43c0957bed9af

Merge "Add null check in setSidebandStream" into oc-dev

media/libstagefright/omx/1.0/WGraphicBufferProducer.cpp

diff --git a/media/libstagefright/omx/1.0/WGraphicBufferProducer.cpp b/media/libstagefright/omx/1.0/WGraphicBufferProducer.cpp
index 36bd624..650db8e 100644
--- a/media/libstagefright/omx/1.0/WGraphicBufferProducer.cpp
+++ b/media/libstagefright/omx/1.0/WGraphicBufferProducer.cpp
@@ -248,7 +248,7 @@
 
 Return<int32_t> TWGraphicBufferProducer::setSidebandStream(const hidl_handle& stream) {
     return static_cast<int32_t>(mBase->setSidebandStream(NativeHandle::create(
-            native_handle_clone(stream), true)));
+            stream ? native_handle_clone(stream) : NULL, true)));
 }
 
 Return<void> TWGraphicBufferProducer::allocateBuffers(