Changeset 33464 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Oct 26, 2010 12:27:50 PM (14 years ago)

Author:

vboxsync

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

67055

Message:

*: Fixes for incorrect RTStrAPrintf usage (it does NOT return an IPRT status code) and the odd bugs nearby.

Location:

trunk/src/VBox/Runtime/r3

Files:

• posix/env-posix.cpp (modified) (1 diff)
• xml.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/posix/env-posix.cpp

@@ -103 +103 @@
     AssertReturn(!strchr(pszVar, '='), VERR_INVALID_PARAMETER);
 
-    /* Check that it exists first.  */
+    /*
+     * Check that it exists first.
+     */
     if (!RTEnvExist(pszVar))
         return VINF_ENV_VAR_NOT_FOUND;
 
-    /* Ok, try remove it. */
+    /*
+     * Ok, try remove it.
+     */
 #ifdef RT_OS_WINDOWS
-    /* Windows does not have unsetenv(). Clear the environment variable according to the MSN docs. */
-    char *pszBuf;
-    int rc = RTStrAPrintf(&pszBuf, "%s=", pszVar);
-    if (RT_FAILURE(rc))
-        return rc;
-    rc = putenv(pszBuf);
-    RTStrFree(pszBuf);
-    if (!rc)
+    /* Use putenv(var=) since Windows does not have unsetenv(). */
+    size_t cchVar = strlen(pszVar);
+    char *pszBuf = (char *)alloca(cchVar + 2);
+    memcpy(pszBuf, pszVar, cchVar);
+    pszBuf[cchVar]     = '=';
+    pszBuf[cchVar + 1] = '\0';
+
+    if (!putenv(pszBuf))
         return VINF_SUCCESS;
+
 #else
     /* This is the preferred function as putenv() like used above does neither work on Solaris nor on Darwin. */

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -1045 +1045 @@
 AttributeNode* ElementNode::setAttribute(const char *pcszName, int32_t i)
 {
-    char *psz = NULL;
-    RTStrAPrintf(&psz, "%RI32", i);
-    AttributeNode *p = setAttribute(pcszName, psz);
-    RTStrFree(psz);
+    char szValue[64];
+    RTStrPrintf(szValue, sizeof(szValue), "%RI32", i);
+    AttributeNode *p = setAttribute(pcszName, szValue);
     return p;
 }
 
-AttributeNode* ElementNode::setAttribute(const char *pcszName, uint32_t i)
-{
-    char *psz = NULL;
-    RTStrAPrintf(&psz, "%RU32", i);
-    AttributeNode *p = setAttribute(pcszName, psz);
-    RTStrFree(psz);
+AttributeNode* ElementNode::setAttribute(const char *pcszName, uint32_t u)
+{
+    char szValue[64];
+    RTStrPrintf(szValue, sizeof(szValue), "%RU32", u);
+    AttributeNode *p = setAttribute(pcszName, szValue);
     return p;
 }
@@ -1063 +1061 @@
 AttributeNode* ElementNode::setAttribute(const char *pcszName, int64_t i)
 {
-    char *psz = NULL;
-    RTStrAPrintf(&psz, "%RI64", i);
-    AttributeNode *p = setAttribute(pcszName, psz);
-    RTStrFree(psz);
+    char szValue[64];
+    RTStrPrintf(szValue, sizeof(szValue), "%RI64", i);
+    AttributeNode *p = setAttribute(pcszName, szValue);
     return p;
 }
 
-AttributeNode* ElementNode::setAttribute(const char *pcszName, uint64_t i)
-{
-    char *psz = NULL;
-    RTStrAPrintf(&psz, "%RU64", i);
-    AttributeNode *p = setAttribute(pcszName, psz);
-    RTStrFree(psz);
+AttributeNode* ElementNode::setAttribute(const char *pcszName, uint64_t u)
+{
+    char szValue[64];
+    RTStrPrintf(szValue, sizeof(szValue), "%RU64", u);
+    AttributeNode *p = setAttribute(pcszName, szValue);
     return p;
 }
 
-AttributeNode* ElementNode::setAttributeHex(const char *pcszName, uint32_t i)
-{
-    char *psz = NULL;
-    RTStrAPrintf(&psz, "0x%RX32", i);
-    AttributeNode *p = setAttribute(pcszName, psz);
-    RTStrFree(psz);
+AttributeNode* ElementNode::setAttributeHex(const char *pcszName, uint32_t u)
+{
+    char szValue[64];
+    RTStrPrintf(szValue, sizeof(szValue), "0x%RX32", u);
+    AttributeNode *p = setAttribute(pcszName, szValue);
     return p;
 }