commit 528641b0a2511209506c1484fda91b1247d2dde2
author Pawan Wagh <waghpawan@google.com> Fri Jan 20 23:33:47 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 20 23:33:47 2023 +0000
tree e7a39da1b7fdee5ffcee30bc2234f8bb98a33369
parent 2a5e0152df85dab2ac1a7a82267c7eeb09366224
parent eec41c20fccde72e81a00bf6577633a4e6200b4c

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

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

Change-Id: I19a6c1fa57b0798018548632bfa5fddeaac3f61a
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;
 }