commit c0e46d3501168723d5d9bf215084db8cdf2c85b6
author Steven Moreland <smoreland@google.com> Wed Sep 12 15:40:49 2018 -0700
committer Steven Moreland <smoreland@google.com> Thu Sep 13 07:12:53 2018 -0700
tree b740cfde752a072affe33dd08c03714af7cc5b48
parent 9496895b1ffe985a34eae73b61dccbbc8a58b20d

libbinder_ndk: fix null binder parceling segfault.

Test: runtests.sh
Test: android.binder.cts.NdkBinderTest
Change-Id: I9d3a049fc36ac600ae2f30cf215e2e4c9db9e91b

libs/binder/ndk/AParcel.cpp

diff --git a/libs/binder/ndk/AParcel.cpp b/libs/binder/ndk/AParcel.cpp
index f5b4bef..f090929 100644
--- a/libs/binder/ndk/AParcel.cpp
+++ b/libs/binder/ndk/AParcel.cpp
@@ -35,7 +35,8 @@
 }
 
 binder_status_t AParcel_writeStrongBinder(AParcel* parcel, AIBinder* binder) {
-    return (*parcel)->writeStrongBinder(binder->getBinder());
+    sp<IBinder> writeBinder = binder != nullptr ? binder->getBinder() : nullptr;
+    return (*parcel)->writeStrongBinder(writeBinder);
 }
 binder_status_t AParcel_readStrongBinder(const AParcel* parcel, AIBinder** binder) {
     sp<IBinder> readBinder = nullptr;