commit fad26c14c7e68c3fe40bda8fd5692b8dbfac1000
author Santhosh Behara <santhoshbehara@codeaurora.org> Mon Oct 16 17:23:54 2017 +0530
committer Pawin Vongmasa <pawin@google.com> Fri Jan 05 18:03:44 2018 +0700
tree 8d2450c188a3887abb20473d32fcfb57b6b382bb
parent bf4637b5b8d8086fdfc92e691d470d283ce6e37f

libmedia: Fix null pointer crash in secure buffer allocation.

Add null pointer check for native_handle as it is null if
secure memory allocation fails.

Author: Vasantha Balla<vballa@codeaurora.org>

Test: fix the bug
Bug: 71053053
Change-Id: I204ca69b9808448788c83a1ae5a642618eca8973
(cherry picked from commit 617b0827bc7daf66272455034c1dddd10b846663)

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 0b40e8d..2cd8b76 100644
--- a/media/libmedia/omx/1.0/WOmxNode.cpp
+++ b/media/libmedia/omx/1.0/WOmxNode.cpp
@@ -151,7 +151,8 @@
                     hidl_handle const& outNativeHandle) {
                 fnStatus = toStatusT(status);
                 *buffer = outBuffer;
-                *native_handle = NativeHandle::create(
+                *native_handle = outNativeHandle.getNativeHandle() == nullptr ?
+                        nullptr : NativeHandle::create(
                         native_handle_clone(outNativeHandle), true);
             }));
     return transStatus == NO_ERROR ? fnStatus : transStatus;