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

Commit 8347d50e 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

Change-Id: I78c237b954f053cd22faaf85aa8d84315172bec5
parents 078f1de7 b9d90149

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;