commit 0375da69b221b05c3e44c49b1ad2f3b93a6bf2f9
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 23 00:13:28 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 23 00:13:30 2017 +0000
tree 7e49dc21fd87bfe36b9d31c3040ef20b6bf5f48f
parent 602f7d6ee9a080b4135a53b16200e1b738ff685e
parent c7455a0bb4909d1d48c86e4a9b699ddda65f87f4

Merge "Check the return value from allocateSecureBuffer" into oc-dev

media/libmedia/omx/1.0/WOmxNode.cpp

diff --git a/media/libmedia/omx/1.0/WOmxNode.cpp b/media/libmedia/omx/1.0/WOmxNode.cpp
index 194378c..a3c4016 100644
--- a/media/libmedia/omx/1.0/WOmxNode.cpp
+++ b/media/libmedia/omx/1.0/WOmxNode.cpp
@@ -350,7 +350,8 @@
             &buffer,
             &bufferData,
             &nativeHandle));
-    _hidl_cb(status, buffer, nativeHandle->handle());
+    _hidl_cb(status, buffer, nativeHandle == nullptr ?
+            nullptr : nativeHandle->handle());
     return Void();
 }
 

media/libstagefright/omx/1.0/WOmxNode.cpp

diff --git a/media/libstagefright/omx/1.0/WOmxNode.cpp b/media/libstagefright/omx/1.0/WOmxNode.cpp
index 1a61007..ab15061 100644
--- a/media/libstagefright/omx/1.0/WOmxNode.cpp
+++ b/media/libstagefright/omx/1.0/WOmxNode.cpp
@@ -353,7 +353,8 @@
             &buffer,
             &bufferData,
             &nativeHandle));
-    _hidl_cb(status, buffer, nativeHandle->handle());
+    _hidl_cb(status, buffer, nativeHandle == nullptr ?
+            nullptr : nativeHandle->handle());
     return Void();
 }