commit 765ff80c92f4a7053e3df0e90578eaaa6d956060
author Devin Moore <devinmoore@google.com> Wed Mar 22 22:56:19 2023 +0000
committer Devin Moore <devinmoore@google.com> Wed Mar 22 22:56:19 2023 +0000
tree ad05aa7b767da15bb98b28748895f3176178e443
parent f7b352ff792e89a1d854fc62ad4427c75b75dc23

Store p.toString() in a string variable in binder_parcel_fuzzer

So it still gets called when FUZZ_LOG isn't enabled.

Test: binder_parcel_fuzzer
Bug: 2503960
Change-Id: Iad6dba81a399ed77142db932ca0f923948255c6b

libs/binder/tests/parcel_fuzzer/binder.cpp

diff --git a/libs/binder/tests/parcel_fuzzer/binder.cpp b/libs/binder/tests/parcel_fuzzer/binder.cpp
index 6da7a5b..46d387c 100644
--- a/libs/binder/tests/parcel_fuzzer/binder.cpp
+++ b/libs/binder/tests/parcel_fuzzer/binder.cpp
@@ -374,7 +374,8 @@
         parcelables::GenericDataParcelable genericDataParcelable;
         status_t status = genericDataParcelable.readFromParcel(&p);
         FUZZ_LOG() << " status: " << status;
-        FUZZ_LOG() << " toString() result: " << genericDataParcelable.toString();
+        std::string toString = genericDataParcelable.toString();
+        FUZZ_LOG() << " toString() result: " << toString;
     },
 };
 // clang-format on

libs/binder/tests/parcel_fuzzer/binder_ndk.cpp

diff --git a/libs/binder/tests/parcel_fuzzer/binder_ndk.cpp b/libs/binder/tests/parcel_fuzzer/binder_ndk.cpp
index 4a60c25..3a1471e 100644
--- a/libs/binder/tests/parcel_fuzzer/binder_ndk.cpp
+++ b/libs/binder/tests/parcel_fuzzer/binder_ndk.cpp
@@ -198,7 +198,8 @@
             aidl::parcelables::GenericDataParcelable genericDataParcelable;
             binder_status_t status = genericDataParcelable.readFromParcel(p.aParcel());
             FUZZ_LOG() << "status: " << status;
-            FUZZ_LOG() << "toString() result: " << genericDataParcelable.toString();
+            std::string toString = genericDataParcelable.toString();
+            FUZZ_LOG() << "toString() result: " << toString;
         },
         [](const NdkParcelAdapter& p, FuzzedDataProvider& provider) {
             FUZZ_LOG() << "about to marshal AParcel";