| commit | 83eb9295262c812677072526af0a00a9cb7bbafc | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Wed Dec 07 16:50:28 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 07 16:50:28 2022 +0000 |
| tree | 2b19c1d362d5eecc3d36f17d622ad176e774c540 | |
| parent | a8ee5dca256ce07090e9b94988bd021921c0d0b8 [diff] | |
| parent | 6e5dda51cd770235764eef026c6a1c26e1014de2 [diff] |
Merge "limit extra fds in random parcel" am: 6e5dda51cd Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2321992 Change-Id: I481ce6027115109aa21679a49229468cf74b4d94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/tests/parcel_fuzzer/random_parcel.cpp b/libs/binder/tests/parcel_fuzzer/random_parcel.cpp index edc695f..f0beed2 100644 --- a/libs/binder/tests/parcel_fuzzer/random_parcel.cpp +++ b/libs/binder/tests/parcel_fuzzer/random_parcel.cpp
@@ -73,6 +73,11 @@ 1)); CHECK(OK == p->writeFileDescriptor(fd.get(), false /*takeOwnership*/)); } else { + // b/260119717 - Adding more FDs can eventually lead to FD limit exhaustion + if (options->extraFds.size() > 1000) { + return; + } + std::vector<base::unique_fd> fds = getRandomFds(&provider); CHECK(OK == p->writeFileDescriptor(fds.begin()->release(),