commit 64e5571e62a0b7ad4c346cf785af94638e7f6776
author Pawan Wagh <waghpawan@google.com> Sat Jan 21 00:58:25 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 21 00:58:25 2023 +0000
tree 80bd1671e3f5d6c9b4125c816223b4a2c8cdbf15
parent d676a9b9918bb7f179e54f9d309d5e8d30f5e80e
parent bb34bd194b3fc667986cd7e7e65d78d8085ec56c

Merge "Check for null data buffer in AParcel_marshal" am: eec41c20fc am: 528641b0a2 am: bb34bd194b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2397532

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

libs/binder/ndk/parcel.cpp

diff --git a/libs/binder/ndk/parcel.cpp b/libs/binder/ndk/parcel.cpp
index 8693022..94f72d9 100644
--- a/libs/binder/ndk/parcel.cpp
+++ b/libs/binder/ndk/parcel.cpp
@@ -700,6 +700,9 @@
         return STATUS_BAD_VALUE;
     }
     const uint8_t* internalBuffer = parcel->get()->data();
+    if (internalBuffer == nullptr) {
+        return STATUS_UNEXPECTED_NULL;
+    }
     memcpy(buffer, internalBuffer + start, len);
     return STATUS_OK;
 }