Changeset 95327 in vbox for trunk/src

Timestamp:

Jun 21, 2022 2:40:37 PM (3 years ago)

Author:

vboxsync

Message:

GA/pam_vbox.cpp: Fixed leak in pam_vbox_read_prop.

File:

• trunk/src/VBox/Additions/common/pam/pam_vbox.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/pam/pam_vbox.cpp

@@ -417 +417 @@
      * hope.  Actually this should never go wrong, as we are generous
      * enough with buffer space. */
-    for (unsigned i = 0; i < 10; i++)
+    for (unsigned i = 0; ; i++)
     {
         void *pvTmpBuf = RTMemRealloc(pvBuf, cbBuf);
@@ -426 +426 @@
                                      &pszValTemp, &u64Timestamp, &pszFlags,
                                      &cbBuf);
-        }
-        else
-            rc = VERR_NO_MEMORY;
-
-        switch (rc)
-        {
-            case VERR_BUFFER_OVERFLOW:
+            if (rc == VERR_BUFFER_OVERFLOW && i < 10)
             {
                 /* Buffer too small, try it with a bigger one next time. */
@@ -438 +432 @@
                 continue; /* Try next round. */
             }
-
-            default:
-                break;
-        }
-
-        /* Everything except VERR_BUFFER_OVERLOW makes us bail out ... */
-        break;
+        }
+        else
+            rc = VERR_NO_MEMORY;
+        break; /* Everything except VERR_BUFFER_OVERFLOW makes us bail out ... */
     }
 
@@ -457 +448 @@
                 /* If we want a property which is read-only on the guest
                  * and it is *not* marked as such, deny access! */
-                pam_vbox_error(hPAM, "pam_vbox_read_prop: key \"%s\" should be read-only on guest but it is not\n",
-                               pszKey);
+                pam_vbox_error(hPAM, "pam_vbox_read_prop: key \"%s\" should be read-only on guest but it is not\n", pszKey);
                 rc = VERR_ACCESS_DENIED;
             }
@@ -464 +454 @@
         else /* No flags, no access! */
         {
-            pam_vbox_error(hPAM, "pam_vbox_read_prop: key \"%s\" contains no/wrong flags (%s)\n",
-                           pszKey, pszFlags);
+            pam_vbox_error(hPAM, "pam_vbox_read_prop: key \"%s\" contains no/wrong flags (%s)\n", pszKey, pszFlags);
             rc = VERR_ACCESS_DENIED;
         }
@@ -474 +463 @@
             if (!RTStrPrintf(pszValue, cbValue, "%s", pszValTemp))
             {
-                pam_vbox_error(hPAM, "pam_vbox_read_prop: could not store value of key \"%s\"\n",
-                               pszKey);
+                pam_vbox_error(hPAM, "pam_vbox_read_prop: could not store value of key \"%s\"\n", pszKey);
                 rc = VERR_INVALID_PARAMETER;
             }
 
             if (RT_SUCCESS(rc))
-                pam_vbox_log(hPAM, "pam_vbox_read_prop: read key \"%s\"=\"%s\"\n",
-                             pszKey, pszValue);
-        }
-    }
-
+                pam_vbox_log(hPAM, "pam_vbox_read_prop: read key \"%s\"=\"%s\"\n", pszKey, pszValue);
+        }
+    }
+
+    RTMemFree(pvBuf);
     pam_vbox_log(hPAM, "pam_vbox_read_prop: read key \"%s\" with rc=%Rrc\n",
                  pszKey, rc);