commit 60eb21841013d355c1adb06d3984423ad80d5580
author Tom Sepez <tsepez@chromium.org> Wed Sep 30 22:41:39 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Sep 30 22:41:39 2020 +0000
tree 1afca2cdd2b8d24acda3bdf4705ed8f397b49b19
parent b0e11f83988a629e388abff5f62df17c52ae81f8

Create locale managers as-needed in pdf_cfgas_stringformatter_fuzzer.cc

Avoid having to do any clean-up at process exit which may not happen, at
an approximate cost of halving the speed of the fuzzer.

Bug: chromium:1132607
Change-Id: Id9a42570abffbe6ed5a91704cc0a9704c7c1559c
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/74230
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

testing/fuzzers/pdf_cfgas_stringformatter_fuzzer.cc

diff --git a/testing/fuzzers/pdf_cfgas_stringformatter_fuzzer.cc b/testing/fuzzers/pdf_cfgas_stringformatter_fuzzer.cc
index d4c914d..baba5da 100644
--- a/testing/fuzzers/pdf_cfgas_stringformatter_fuzzer.cc
+++ b/testing/fuzzers/pdf_cfgas_stringformatter_fuzzer.cc
@@ -35,14 +35,6 @@
   auto* state = static_cast<XFAProcessState*>(FPDF_GetFuzzerPerProcessState());
   cppgc::Heap* heap = state->GetHeap();
 
-  // Static for speed.
-  static std::vector<cppgc::Persistent<CXFA_LocaleMgr>> mgrs;
-  if (mgrs.empty()) {
-    for (const auto* locale : kLocales)
-      mgrs.push_back(cppgc::MakeGarbageCollected<CXFA_LocaleMgr>(
-          heap->GetAllocationHandle(), heap, nullptr, locale));
-  }
-
   uint8_t test_selector = data[0] % 10;
   uint8_t locale_selector = data[1] % pdfium::size(kLocales);
   uint8_t type_selector = data[2] % pdfium::size(kTypes);
@@ -64,37 +56,55 @@
     case 0:
       fmt->FormatText(value, &result);
       break;
-    case 1:
-      fmt->FormatNum(mgrs[locale_selector], value, &result);
+    case 1: {
+      auto* mgr = cppgc::MakeGarbageCollected<CXFA_LocaleMgr>(
+          heap->GetAllocationHandle(), heap, nullptr,
+          kLocales[locale_selector]);
+      fmt->FormatNum(mgr, value, &result);
       break;
-    case 2:
-      fmt->FormatDateTime(mgrs[locale_selector], value, kTypes[type_selector],
-                          &result);
+    }
+    case 2: {
+      auto* mgr = cppgc::MakeGarbageCollected<CXFA_LocaleMgr>(
+          heap->GetAllocationHandle(), heap, nullptr,
+          kLocales[locale_selector]);
+      fmt->FormatDateTime(mgr, value, kTypes[type_selector], &result);
       break;
-    case 3:
+    }
+    case 3: {
       fmt->FormatNull(&result);
       break;
-    case 4:
+    }
+    case 4: {
       fmt->FormatZero(&result);
       break;
-    case 5:
+    }
+    case 5: {
       fmt->ParseText(value, &result);
       break;
-    case 6:
-      fmt->ParseNum(mgrs[locale_selector], value, &result);
+    }
+    case 6: {
+      auto* mgr = cppgc::MakeGarbageCollected<CXFA_LocaleMgr>(
+          heap->GetAllocationHandle(), heap, nullptr,
+          kLocales[locale_selector]);
+      fmt->ParseNum(mgr, value, &result);
       break;
-    case 7:
-      fmt->ParseDateTime(mgrs[locale_selector], value, kTypes[type_selector],
-                         &dt);
+    }
+    case 7: {
+      auto* mgr = cppgc::MakeGarbageCollected<CXFA_LocaleMgr>(
+          heap->GetAllocationHandle(), heap, nullptr,
+          kLocales[locale_selector]);
+      fmt->ParseDateTime(mgr, value, kTypes[type_selector], &dt);
       break;
-    case 8:
+    }
+    case 8: {
       fmt->ParseNull(value);
       break;
-    case 9:
+    }
+    case 9: {
       fmt->ParseZero(value);
       break;
+    }
   }
-
   state->ForceGCAndPump();
   return 0;
 }