| commit | bb34bd194b3fc667986cd7e7e65d78d8085ec56c | [log] [tgz] |
|---|---|---|
| author | Pawan Wagh <waghpawan@google.com> | Sat Jan 21 00:10:56 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jan 21 00:10:56 2023 +0000 |
| tree | cb62050c3b0596e4876d0381da51e9a5467245c0 | |
| parent | 46d109ecb1fd5e1f209b327ce150960ba460bae4 [diff] | |
| parent | 528641b0a2511209506c1484fda91b1247d2dde2 [diff] |
Merge "Check for null data buffer in AParcel_marshal" am: eec41c20fc am: 528641b0a2 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2397532 Change-Id: I758f9a715b9e9f2f720be47482ec43bfff372c2d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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; }