commit 124f667b4feb8c7141e88624b290d94c7df95a68
author Zhaoming Yin <zhaomingyin@google.com> Sat Oct 31 00:43:35 2020 +0000
committer Zhaoming Yin <zhaomingyin@google.com> Thu Nov 05 15:05:58 2020 -0800
tree 9cbf17fc4ba1c5ba2a57b7b65b7ab6436ebdef86
parent 3f53bf0525bd5c21ff6cc3235b93cb26a7866ea8

DO NOT MERGE: fix evs_enumerator_fuzzer failure on rvc-qpr-dev

Bug: 171062688
Test: build and run fuzzer

Change-Id: I585b4c6131f0556c7a6e3487c77ffba60ffbfaf9

evs/manager/1.1/test/fuzzer/EnumeratorFuzzer.cpp

diff --git a/evs/manager/1.1/test/fuzzer/EnumeratorFuzzer.cpp b/evs/manager/1.1/test/fuzzer/EnumeratorFuzzer.cpp
index d0bfebf..6da27c8 100644
--- a/evs/manager/1.1/test/fuzzer/EnumeratorFuzzer.cpp
+++ b/evs/manager/1.1/test/fuzzer/EnumeratorFuzzer.cpp
@@ -62,7 +62,7 @@
 static vector<sp<IEvsCamera_1_0>> sVirtualCameras;
 static vector<sp<IEvsDisplay_1_0>> sDisplays;
 
-extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) {
+bool DoInitialization() {
     setenv("TREBLE_TESTING_OVERRIDE", "true", true);
     configureRpcThreadpool(2, false /* callerWillNotJoin */);
 
@@ -76,22 +76,21 @@
         exit(2);
     }
 
-    // Inititialize the enumerator that we are going to test
-    // TODO(b/162631113) if we place the initialization of enumerator inside
-    // LLVMFuzzerTestOneInput, there will be issues in destruction.
-    sEnumerator = new Enumerator();
-    if (!sEnumerator->init(kMockHWEnumeratorName)) {
-        std::cerr << "Failed to connect to hardware service"
-                  << "- quitting from LLVMFuzzerInitialize" << std::endl;
-        exit(1);
-    }
-
-    return 0;
+    return true;
 }
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
     FuzzedDataProvider fdp(data, size);
 
+    // Inititialize the enumerator that we are going to test
+    static bool initialized = DoInitialization();
+    sEnumerator = new Enumerator();
+    if (!initialized || !sEnumerator->init(kMockHWEnumeratorName)) {
+        std::cerr << "Failed to connect to hardware service"
+                  << "- quitting from LLVMFuzzerInitialize" << std::endl;
+        exit(1);
+    }
+
     while (fdp.remaining_bytes() > kMaxFuzzerConsumedBytes) {
         switch (fdp.ConsumeIntegralInRange<uint32_t>(0, EVS_FUZZ_API_SUM)) {
             case EVS_FUZZ_GET_CAMERA_LIST: {
@@ -102,7 +101,7 @@
                 uint64_t whichCam =
                             fdp.ConsumeIntegralInRange<uint64_t>(startMockHWCameraId,
                                                                  endMockHWCameraId-1);
-                hidl_string camStr = to_string(whichCam);
+                hidl_string camStr = std::to_string(whichCam);
                 sp<IEvsCamera_1_0> virtualCam = sEnumerator->openCamera(camStr);
                 if (virtualCam != nullptr) {
                     sVirtualCameras.emplace_back(virtualCam);
@@ -144,7 +143,7 @@
                 uint64_t whichCam =
                             fdp.ConsumeIntegralInRange<uint64_t>(startMockHWCameraId,
                                                                  endMockHWCameraId-1);
-                hidl_string camStr = to_string(whichCam);
+                hidl_string camStr = std::to_string(whichCam);
                 Stream streamCfg = {};
                 sp<IEvsCamera_1_1> virtualCam = sEnumerator->openCamera_1_1(camStr, streamCfg);
                 if (virtualCam != nullptr) {
@@ -191,6 +190,8 @@
                 break;
         }
     }
+    // Explicitly destroy the Enumerator
+    sEnumerator = nullptr;
     return 0;
 }