commit c7455a0bb4909d1d48c86e4a9b699ddda65f87f4
author Pawin Vongmasa <pawin@google.com> Fri May 19 23:57:44 2017 -0700
committer Pawin Vongmasa <pawin@google.com> Mon May 22 21:55:26 2017 +0000
tree 3baaeb4a9ff53b5c432281d791db662574c3f426
parent 873b2bc8ec91ce1aa526004052347f253536ab6a

Check the return value from allocateSecureBuffer

Test: Small CtsMediaTestCases

Test: com.google.android.media.gts.WidevineCodecStressTests in
GtsMediaTestCases

Bug: 38452958
Change-Id: Iba53c3fc144a3ee7d1f54b62ab3836b1a3a46dc6

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();
 }