commit eec41c20fccde72e81a00bf6577633a4e6200b4c
author Pawan Wagh <waghpawan@google.com> Fri Jan 20 22:32:08 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 20 22:32:08 2023 +0000
tree 89caee5cc20e1bfcf20c6666225554f863e028a8
parent b621667caa69883ac5c2b4bb9fdd0256fb07ec1d
parent 0beb956917b34471e5709a6ce2ab47d83011b1e6

Merge "Check for null data buffer in AParcel_marshal"

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;
 }