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

Commit 914eb6c6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fix potential read null pointer" am: 48584672 am: e2728c64 am:... 

Merge "fix potential read null pointer" am: 48584672 am: e2728c64 am: 43d0c0df am: 937c37c7 am: da612e70

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2185939



Change-Id: I67472f4212cfc6b35b992cf0fcb5f999fc337481
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0efaedc da612e70

media/codec2/hidl/1.0/utils/types.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1447,6 +1447,10 @@ bool objcpy(C2FrameData* d, const FrameData& s, 
bool objcpy(C2BaseBlock* d, const BaseBlock& s) {

    switch (s.getDiscriminator()) {

    case BaseBlock::hidl_discriminator::nativeBlock: {

            if (s.nativeBlock() == nullptr) {

                LOG(ERROR) << "Null BaseBlock::nativeBlock handle";

                return false;

            }

            native_handle_t* sHandle =

                    native_handle_clone(s.nativeBlock());

            if (sHandle == nullptr) {