Changeset 104480 in vbox

Timestamp:

May 2, 2024 2:17:45 PM (9 months ago)

Author:

vboxsync

Message:

ValKit/bootsectors/VBoxBs3Obj2Hdr: Fix the 6 other places we may 'leak' file handles on exit. bugref:3409

File:

• trunk/src/VBox/ValidationKit/bootsectors/VBoxBs3Obj2Hdr.cpp (modified) (6 diffs)

trunk/src/VBox/ValidationKit/bootsectors/VBoxBs3Obj2Hdr.cpp

@@ -241 +241 @@
 
 
-int main(int argc, char **argv)
+static RTEXITCODE makeParfaitHappy(int argc, char **argv, FILE **ppOutput, const char **ppszOutput)
 {
     /*
@@ -247 +247 @@
      */
     bool        fDashDash = false;
-    const char *pszOutput = NULL;
-    FILE       *pOutput   = NULL;
+    *ppszOutput = NULL;
+    *ppOutput   = NULL;
     for (int i = 1; i < argc; i++)
     {
@@ -306 +306 @@
 
                     case 'o':
-                        if (pOutput && pOutput != stdout)
-                            fclose(pOutput); /** @todo check status. */
-                        pOutput   = NULL;
-                        pszOutput = pszValue;
+                    {
+                        FILE * const pOldOutput = *ppOutput;
+                        *ppOutput = NULL;
+                        if (pOldOutput && pOldOutput != stdout)
+                        {
+                            if (fclose(pOldOutput))
+                            {
+                                fprintf(stderr, "error: Write/close error on '%s'\n", *ppszOutput);
+                                return RTEXITCODE_FAILURE;
+                            }
+                        }
+                        *ppszOutput = pszValue;
                         continue;
+                    }
 
                     case 'q':
@@ -338 +347 @@
         {
             /* Make sure we've got an output file. */
-            if (!pOutput)
-            {
-                if (!pszOutput || strcmp(pszOutput, "-") == 0)
-                    pOutput = stdout;
+            if (!*ppOutput)
+            {
+                if (!*ppszOutput || strcmp(*ppszOutput, "-") == 0)
+                    *ppOutput = stdout;
                 else
                 {
-                    pOutput = fopen(pszOutput, "w");
-                    if (!pOutput)
-                    {
-                        fprintf(stderr, "error: Failed to open '%s' for writing!\n", pszOutput);
+                    *ppOutput = fopen(*ppszOutput, "w");
+                    if (!*ppOutput)
+                    {
+                        fprintf(stderr, "error: Failed to open '%s' for writing!\n", *ppszOutput);
                         return RTEXITCODE_FAILURE;
                     }
@@ -357 +366 @@
             void  *pvFile;
             if (!readfile(pszArg, &pvFile, &cbFile))
-            {
-                if (pOutput)
-                    fclose(pOutput);
                 return RTEXITCODE_FAILURE;
-            }
-
-            RTEXITCODE rcExit = ProcessObjectFile(pOutput, (uint8_t const *)pvFile, cbFile, pszArg);
+
+            RTEXITCODE rcExit = ProcessObjectFile(*ppOutput, (uint8_t const *)pvFile, cbFile, pszArg);
 
             free(pvFile);
             if (rcExit != RTEXITCODE_SUCCESS)
-            {
-                if (pOutput)
-                    fclose(pOutput);
                 return rcExit;
-            }
         }
     }
 
+    return RTEXITCODE_SUCCESS;
+}
+
+
+int main(int argc, char **argv)
+{
     /*
-     * Flush+close output exit.
+     * Use helper function to do the actual main work so we can perform
+     * cleanup to make pedantic static analysers happy.
+     */
+    const char *pszOutput = NULL;
+    FILE       *pOutput = NULL;
+    RTEXITCODE  rcExit = makeParfaitHappy(argc, argv, &pOutput, &pszOutput);
+
+    /*
+     * Flush+close output before we exit.
      */
     if (pOutput)
@@ -384 +399 @@
         {
             fprintf(stderr, "error: Write error on '%s'\n", pszOutput ? pszOutput : "-");
-            return RTEXITCODE_FAILURE;
+            rcExit = RTEXITCODE_FAILURE;
         }
     }
-
-    return RTEXITCODE_SUCCESS;
+    return rcExit;
 }