commit 749becfa689186a6ab5cc6d83f9f470cced9b05c
author Steven Moreland <smoreland@google.com> Thu Jul 13 21:19:50 2023 +0000
committer Steven Moreland <smoreland@google.com> Tue Jul 18 21:04:07 2023 +0000
tree f413d8b2a8618a68f750e1b77e60690edd653a3d
parent 740c0d274c22cdf1c1744cc4c0d7213b23fff8ed

Fix libutils_fuzz_string8 deadlock.

Bug: 290835996
Test: libutils_fuzz_string8 for several minutes
Change-Id: I9b312dd968c380f4fa2a837d38121d0a7a7ac7b1

libutils/String8_fuzz.cpp

diff --git a/libutils/String8_fuzz.cpp b/libutils/String8_fuzz.cpp
index faf49b6..e5dcd31 100644
--- a/libutils/String8_fuzz.cpp
+++ b/libutils/String8_fuzz.cpp
@@ -45,6 +45,8 @@
                     str1->toLower();
                 },
                 [](FuzzedDataProvider*, android::String8* str1, android::String8* str2) -> void {
+                    if (str2->size() == 0) return;
+
                     str1->removeAll(str2->c_str());
                 },
                 [](FuzzedDataProvider*, android::String8* str1, android::String8* str2) -> void {