Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef977699 authored by Santhosh Behara's avatar Santhosh Behara Committed by android-build-merger
Browse files

Merge "libmedia: Fix null pointer crash in secure buffer allocation." into oc-dev am: b9d90149 

am: 8347d50e

Change-Id: I8c4e32aad8f8a4e8b3faf3a55fd9f96175093210
parents a1f05a71 8347d50e

media/libmedia/omx/1.0/WOmxNode.cpp

+2 −1
Original line number Diff line number Diff line
@@ -151,7 +151,8 @@ status_t LWOmxNode::allocateSecureBuffer( 
                    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;

media/libstagefright/omx/1.0/WOmxNode.cpp

+2 −1
Original line number Diff line number Diff line
@@ -154,7 +154,8 @@ status_t LWOmxNode::allocateSecureBuffer( 
                    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;