Changeset 22526 in vbox for trunk/src

Timestamp:

Aug 27, 2009 1:52:56 PM (16 years ago)

Author:

vboxsync

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

51548

Message:

CFGM: Fixed string length bug in CFGMR3InsertStringFV.

Location:

trunk/src/VBox/VMM

Files:

• CFGM.cpp (modified) (15 diffs)
• CFGMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/CFGM.cpp

@@ -549 +549 @@
 
             case CFGMVALUETYPE_STRING:
-                *pcb = pLeaf->Value.String.cch;
+                *pcb = pLeaf->Value.String.cb;
                 break;
 
@@ -638 +638 @@
         if (pLeaf->enmType == CFGMVALUETYPE_STRING)
         {
-            if (cchString >= pLeaf->Value.String.cch)
+            size_t cbSrc = pLeaf->Value.String.cb;
+            if (cchString >= cbSrc)
             {
-                memcpy(pszString, pLeaf->Value.String.psz, pLeaf->Value.String.cch);
-                memset(pszString + pLeaf->Value.String.cch, 0, cchString - pLeaf->Value.String.cch);
+                memcpy(pszString, pLeaf->Value.String.psz, cbSrc);
+                memset(pszString + cbSrc, 0, cchString - cbSrc);
             }
             else
@@ -671 +672 @@
         if (pLeaf->enmType == CFGMVALUETYPE_STRING)
         {
-            if (cchString >= pLeaf->Value.String.cch)
+            size_t cbSrc = pLeaf->Value.String.cb;
+            if (cchString >= cbSrc)
             {
-                memcpy(pszString, pLeaf->Value.String.psz, pLeaf->Value.String.cch);
-                memset(pszString + pLeaf->Value.String.cch, 0, cchString - pLeaf->Value.String.cch);
+                memcpy(pszString, pLeaf->Value.String.psz, cbSrc);
+                memset(pszString + cbSrc, 0, cchString - cbSrc);
             }
             else
@@ -1535 +1537 @@
                 MMR3HeapFree(pLeaf->Value.String.psz);
                 pLeaf->Value.String.psz = NULL;
-                pLeaf->Value.String.cch = 0;
+                pLeaf->Value.String.cb = 0;
                 break;
 
@@ -1574 +1576 @@
  * @param   pszName         Value name.
  * @param   pszString       The value.
- */            
+ */
 VMMR3DECL(int) CFGMR3InsertString(PCFGMNODE pNode, const char *pszName, const char *pszString)
 {
@@ -1583 +1585 @@
          * Allocate string object first.
          */
-        size_t cchString = strlen(pszString) + 1;
-        char *pszStringCopy = (char *)MMR3HeapAlloc(pNode->pVM, MM_TAG_CFGM_STRING, RT_ALIGN_Z(cchString, 16));
+        size_t cbString = strlen(pszString) + 1;
+        char *pszStringCopy = (char *)MMR3HeapAlloc(pNode->pVM, MM_TAG_CFGM_STRING, cbString);
         if (pszStringCopy)
         {
-            memcpy(pszStringCopy, pszString, cchString);
+            memcpy(pszStringCopy, pszString, cbString);
 
             /*
@@ -1598 +1600 @@
                 pLeaf->enmType = CFGMVALUETYPE_STRING;
                 pLeaf->Value.String.psz = pszStringCopy;
-                pLeaf->Value.String.cch = cchString;
+                pLeaf->Value.String.cb  = cbString;
             }
             else
@@ -1614 +1616 @@
 
 /**
- * Same as CFGMR3InsertString except the string value given in RTStrPrintfV 
- * fashion. 
- *  
+ * Same as CFGMR3InsertString except the string value given in RTStrPrintfV
+ * fashion.
+ *
  * @returns VBox status code.
  * @param   pNode           Parent node.
@@ -1643 +1645 @@
                 pLeaf->enmType = CFGMVALUETYPE_STRING;
                 pLeaf->Value.String.psz = pszString;
-                pLeaf->Value.String.cch = strlen(pszString);
+                pLeaf->Value.String.cb  = strlen(pszString) + 1;
             }
             else
@@ -1659 +1661 @@
 
 /**
- * Same as CFGMR3InsertString except the string value given in RTStrPrintf 
- * fashion. 
- *  
+ * Same as CFGMR3InsertString except the string value given in RTStrPrintf
+ * fashion.
+ *
  * @returns VBox status code.
  * @param   pNode           Parent node.
@@ -1680 +1682 @@
 /**
  * Same as CFGMR3InsertString except the string value given as a UTF-16 string.
- *  
+ *
  * @returns VBox status code.
  * @param   pNode           Parent node.
@@ -1718 +1720 @@
              * Allocate string object first.
              */
-            void *pvCopy = MMR3HeapAlloc(pNode->pVM, MM_TAG_CFGM_STRING, RT_ALIGN_Z(cbBytes, 16));
+            void *pvCopy = MMR3HeapAlloc(pNode->pVM, MM_TAG_CFGM_STRING, cbBytes);
             if (pvCopy || !cbBytes)
             {
@@ -2465 +2467 @@
 VMMR3DECL(int) CFGMR3QueryStringAlloc(PCFGMNODE pNode, const char *pszName, char **ppszString)
 {
-    size_t cch;
-    int rc = CFGMR3QuerySize(pNode, pszName, &cch);
-    if (RT_SUCCESS(rc))
-    {
-        char *pszString = (char *)MMR3HeapAlloc(pNode->pVM, MM_TAG_CFGM_USER, cch);
+    size_t cbString;
+    int rc = CFGMR3QuerySize(pNode, pszName, &cbString);
+    if (RT_SUCCESS(rc))
+    {
+        char *pszString = (char *)MMR3HeapAlloc(pNode->pVM, MM_TAG_CFGM_USER, cbString);
         if (pszString)
         {
-            rc = CFGMR3QueryString(pNode, pszName, pszString, cch);
+            rc = CFGMR3QueryString(pNode, pszName, pszString, cbString);
             if (RT_SUCCESS(rc))
                 *ppszString = pszString;
@@ -2497 +2499 @@
 VMMR3DECL(int) CFGMR3QueryStringAllocDef(PCFGMNODE pNode, const char *pszName, char **ppszString, const char *pszDef)
 {
-    size_t cch;
-    int rc = CFGMR3QuerySize(pNode, pszName, &cch);
+    size_t cbString;
+    int rc = CFGMR3QuerySize(pNode, pszName, &cbString);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT)
     {
-        cch = strlen(pszDef) + 1;
+        cbString = strlen(pszDef) + 1;
         rc = VINF_SUCCESS;
     }
     if (RT_SUCCESS(rc))
     {
-        char *pszString = (char *)MMR3HeapAlloc(pNode->pVM, MM_TAG_CFGM_USER, cch);
+        char *pszString = (char *)MMR3HeapAlloc(pNode->pVM, MM_TAG_CFGM_USER, cbString);
         if (pszString)
         {
-            rc = CFGMR3QueryStringDef(pNode, pszName, pszString, cch, pszDef);
+            rc = CFGMR3QueryStringDef(pNode, pszName, pszString, cbString, pszDef);
             if (RT_SUCCESS(rc))
                 *ppszString = pszString;
@@ -2607 +2609 @@
 
             case CFGMVALUETYPE_STRING:
-                pHlp->pfnPrintf(pHlp, "  %-*s <string>  = \"%s\" (cch=%d)\n", (int)cchMax, pLeaf->szName, pLeaf->Value.String.psz, pLeaf->Value.String.cch);
+                pHlp->pfnPrintf(pHlp, "  %-*s <string>  = \"%s\" (cb=%zu)\n", (int)cchMax, pLeaf->szName, pLeaf->Value.String.psz, pLeaf->Value.String.cb);
                 break;
 
             case CFGMVALUETYPE_BYTES:
-                pHlp->pfnPrintf(pHlp, "  %-*s <bytes>   = \"%.*Rhxs\" (cb=%d)\n", (int)cchMax, pLeaf->szName, pLeaf->Value.Bytes.cb, pLeaf->Value.Bytes.pau8, pLeaf->Value.Bytes.cb);
+                pHlp->pfnPrintf(pHlp, "  %-*s <bytes>   = \"%.*Rhxs\" (cb=%zu)\n", (int)cchMax, pLeaf->szName, pLeaf->Value.Bytes.cb, pLeaf->Value.Bytes.pau8, pLeaf->Value.Bytes.cb);
                 break;
 

trunk/src/VBox/VMM/CFGMInternal.h

@@ -49 +49 @@
     {
         /** Length of string. (In bytes, including the terminator.) */
-        size_t          cch;
+        size_t          cb;
         /** Pointer to the string. */
         char           *psz;