diff options
| author | 2022-10-06 23:32:53 +0000 | |
|---|---|---|
| committer | 2022-10-06 23:32:53 +0000 | |
| commit | ff68a53b1f80c880693e32293f354ae743e3e45c (patch) | |
| tree | b595f6fcc104c3c81cf122efdc04d7d092f216ce | |
| parent | 63c3034c5cd7773594226f9ff94aadc3b65dbc5a (diff) | |
| parent | ff741c67e64c307650b541af58a48f8cf31634a2 (diff) | |
Merge "libbinder: avoid uninteresting protocol version crash in fuzzer" am: fafdb185aa am: ff741c67e6
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2241485
Change-Id: I12ed15a0eb16e57047ede98f37661906855acfc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/tests/parcel_fuzzer/random_parcel.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/binder/tests/parcel_fuzzer/random_parcel.cpp b/libs/binder/tests/parcel_fuzzer/random_parcel.cpp index 4bb486bef0..edc695f81a 100644 --- a/libs/binder/tests/parcel_fuzzer/random_parcel.cpp +++ b/libs/binder/tests/parcel_fuzzer/random_parcel.cpp @@ -36,6 +36,11 @@ void fillRandomParcel(Parcel* p, FuzzedDataProvider&& provider, RandomParcelOpti if (provider.ConsumeBool()) { auto session = RpcSession::make(RpcTransportCtxFactoryRaw::make()); CHECK_EQ(OK, session->addNullDebuggingClient()); + // Set the protocol version so that we don't crash if the session + // actually gets used. This isn't cheating because the version should + // always be set if the session init succeeded and we aren't testing the + // session init here (it is bypassed by addNullDebuggingClient). + session->setProtocolVersion(RPC_WIRE_PROTOCOL_VERSION); p->markForRpc(session); if (options->writeHeader) { |