commit eb70011753b112529a349d4fa42b2fa1d11e208e
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 02 05:00:29 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 02 05:00:29 2022 +0000
tree 2e7c47920a62a8f9865678a6b23e0b4d7ad2a0bf
parent 25c5509c87591cf90028a81d4ecda700bef26699
parent 5dc4feb37bfc3093ed93027fa81962269b2e8d87

Merge "fix potential read null pointer" into tm-qpr-dev

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) {