Changeset 104549 in vbox

Timestamp:

May 8, 2024 12:27:24 PM (7 months ago)

Author:

vboxsync

Message:

Runtime/common/fuzz: Some parfait warning fixes, bugref:3409

Location:

trunk/src/VBox/Runtime/common/fuzz

Files:

• fuzz-observer.cpp (modified) (5 diffs)
• fuzz-target-recorder.cpp (modified) (1 diff)
• fuzzmastercmd.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/fuzz/fuzz-observer.cpp

@@ -597 +597 @@
             uint32_t cbStateWr = (uint32_t)cbState;
             rc = RTPipeWriteBlocking(pExecCtx->hPipeStdinW, &cbStateWr, sizeof(cbStateWr), NULL);
-            rc = RTPipeWriteBlocking(pExecCtx->hPipeStdinW, pvState, cbState, NULL);
+            if (RT_SUCCESS(rc))
+                rc = RTPipeWriteBlocking(pExecCtx->hPipeStdinW, pvState, cbState, NULL);
             if (RT_SUCCESS(rc))
             {
@@ -636 +637 @@
                                         else if (achBuf[i] == 'A')
                                         {
-                                            /** @todo Advance our fuzzer to get the added input. */
+                                            while (cFuzzedInputs--)
+                                            {
+                                                RTFUZZINPUT hFuzzInput;
+                                                rc = RTFuzzCtxInputGenerate(pThis->hFuzzCtx, &hFuzzInput);
+                                                if (RT_SUCCESS(rc))
+                                                    RTFuzzInputRelease(hFuzzInput);
+                                            }
+
+                                            /* We should be at the input generated by the client now. */
+                                            RTFUZZINPUT hFuzzInput;
+                                            rc = RTFuzzCtxInputGenerate(pThis->hFuzzCtx, &hFuzzInput);
+                                            if (RT_SUCCESS(rc))
+                                                rc = RTFuzzInputAddToCtxCorpus(hFuzzInput);
                                         }
                                     }
@@ -832 +845 @@
                 AssertFailed();
 
-            /*
-             * Check whether we reached an unknown target state and add the input to the
-             * corpus in that case.
-             */
-            rc = RTFuzzTgtStateAddToRecorder(pExecCtx->hTgtState);
             if (RT_SUCCESS(rc))
             {
-                /* Add to corpus and create a new target state for the next run. */
-                RTFuzzInputAddToCtxCorpus(hFuzzInput);
-                RTFuzzTgtStateRelease(pExecCtx->hTgtState);
-                pExecCtx->hTgtState = NIL_RTFUZZTGTSTATE;
-                rc = RTFuzzTgtRecorderCreateNewState(pThis->hTgtRec, &pExecCtx->hTgtState);
-                AssertRC(rc);
-            }
-            else
-            {
-                Assert(rc == VERR_ALREADY_EXISTS);
-                /* Reset the state for the next run. */
-                rc = RTFuzzTgtStateReset(pExecCtx->hTgtState);
-                AssertRC(rc);
+                /*
+                 * Check whether we reached an unknown target state and add the input to the
+                 * corpus in that case.
+                 */
+                rc = RTFuzzTgtStateAddToRecorder(pExecCtx->hTgtState);
+                if (RT_SUCCESS(rc))
+                {
+                    /* Add to corpus and create a new target state for the next run. */
+                    RTFuzzInputAddToCtxCorpus(hFuzzInput);
+                    RTFuzzTgtStateRelease(pExecCtx->hTgtState);
+                    pExecCtx->hTgtState = NIL_RTFUZZTGTSTATE;
+                    rc = RTFuzzTgtRecorderCreateNewState(pThis->hTgtRec, &pExecCtx->hTgtState);
+                    AssertRC(rc);
+                }
+                else
+                {
+                    Assert(rc == VERR_ALREADY_EXISTS);
+                    /* Reset the state for the next run. */
+                    rc = RTFuzzTgtStateReset(pExecCtx->hTgtState);
+                    AssertRC(rc);
+                }
             }
             RTFuzzInputRelease(hFuzzInput);
@@ -1068 +1084 @@
         else
             rc = VERR_BUFFER_OVERFLOW;
-        fSep = true;
+        /*fSep = true; Not used below currently. */
     }
 
@@ -1348 +1364 @@
     int rc = VINF_SUCCESS;
     if (!cProcs)
-        cProcs = RT_MIN(RTMpGetPresentCoreCount(), sizeof(uint64_t) * 8);
+    {
+        cProcs = RTMpGetPresentCoreCount();
+        cProcs = RT_MIN(cProcs, sizeof(uint64_t) * 8);
+    }
 
     rc = rtFuzzObsSetupSanitizerCfg(pThis);

trunk/src/VBox/Runtime/common/fuzz/fuzz-target-recorder.cpp

@@ -346 +346 @@
         }
 
-        rc = RTSemRWReleaseRead(pThis->hSemRwEdges); AssertRC(rc);
+        int rc2 = RTSemRWReleaseRead(pThis->hSemRwEdges); AssertRC(rc2);
+        if (   RT_FAILURE(rc2)
+            && RT_SUCCESS(rc))
+            rc = rc2;
     }
 

trunk/src/VBox/Runtime/common/fuzz/fuzzmastercmd.cpp

@@ -474 +474 @@
                             RTJsonValueRelease(hVal);
                         }
+                        if (RT_FAILURE(rc))
+                            break;
                         rc = RTJsonIteratorNext(hEnvIt);
                     } while (RT_SUCCESS(rc));
@@ -549 +551 @@
                     RTJsonValueRelease(hVal);
                 }
+                if (RT_FAILURE(rc))
+                    break;
+
                 rc = RTJsonIteratorNext(hSanIt);
             } while (RT_SUCCESS(rc));
@@ -984 +989 @@
                     RTJsonValueRelease(hVal);
                 }
+                if (RT_FAILURE(rc))
+                    break;
+
                 rc = RTJsonIteratorNext(hTgtIt);
             } while (RT_SUCCESS(rc));
@@ -1788 +1796 @@
         /* Option variables:  */
         bool fDaemonize = false;
-        bool fDaemonized = false;
         const char *pszLoadCfg = NULL;
         RTFUZZCMDMASTER This;
@@ -1833 +1840 @@
 
                 case 'Z':
-                    fDaemonized = true;
                     fDaemonize = false;
                     break;