commit 43d0c0df933777678b40024587e3ba624b84db38
author Treehugger Robot <treehugger-gerrit@google.com> Sat Aug 20 03:18:33 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Aug 20 03:18:33 2022 +0000
tree cad301352ef83915bf3422e70cc17b439ecb9fde
parent 8ec88ab1f8cdf6c41c4aa5f92c58c792c2938123
parent e2728c64981efa5e2002ee63ef23a6b6a5bede01

Merge "fix potential read null pointer" am: 4858467222 am: e2728c6498

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

Change-Id: I2be08e4555f00852d5e2103b3ba4c56be5990d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/media/codec2/hidl/1.0/utils/types.cpp b/media/codec2/hidl/1.0/utils/types.cpp
index 5c24bd7..35a3b53 100644
--- a/media/codec2/hidl/1.0/utils/types.cpp
+++ b/media/codec2/hidl/1.0/utils/types.cpp
@@ -1447,6 +1447,10 @@
 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) {