Changeset 92669 in vbox

Timestamp:

Dec 1, 2021 9:14:24 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148565

Message:

IPRT/RTEnvDupEx: Use RTStrAlloc instead of RTMemAlloc for big values. Added missing alloc failure check.

File:

• trunk/src/VBox/Runtime/generic/RTEnvDupEx-generic.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/generic/RTEnvDupEx-generic.cpp

@@ -53 +53 @@
 
     /*
-     * It's a bug bugger.
+     * It's a big bugger.
      */
-    size_t  cbBuf  = _1K;
-    char   *pszBuf = (char *)RTMemAlloc(cbBuf);
-    for (;;)
+    size_t cbBuf = _1K;
+    do
     {
+        char *pszBuf = RTStrAlloc(cbBuf);
+        AssertBreak(pszBuf);
+
         rc = RTEnvGetEx(Env, pszVar, pszBuf, cbBuf, NULL);
         if (RT_SUCCESS(rc))
-            return pszBuf; /* ASSUMES RTMemAlloc can be freed by RTStrFree! */
+            return pszBuf;
 
+        RTStrFree(pszBuf);
+
+        /* If overflow double the buffer. */
         if (rc != VERR_BUFFER_OVERFLOW)
             break;
+        cbBuf *= 2;
+    } while (cbBuf < _64M);
 
-        if (cbBuf >= 64 * _1M)
-            break;
-        cbBuf *= 2;
-
-        char *pszNew = (char *)RTMemRealloc(pszBuf, cbBuf);
-        if (!pszNew)
-            break;
-        pszBuf = pszNew;
-    }
-
-    RTMemFree(pszBuf);
     return NULL;
 }
-RT_EXPORT_SYMBOL(RTEnvGetExecEnvP);
+RT_EXPORT_SYMBOL(RTEnvDupEx);