Changeset 24292 in vbox for trunk/src/VBox/VMM/SSM.cpp

Timestamp:

Nov 3, 2009 3:19:17 PM (15 years ago)

Author:

vboxsync

Message:

SSMSetLoadErrorV: Don't use %N as the VMSetError message may be formatted several time.

File:

• trunk/src/VBox/VMM/SSM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/SSM.cpp

@@ -6882 +6882 @@
 
     /*
+     * Format the incoming error.
+     */
+    char *pszMsg;
+    RTStrAPrintfV(&pszMsg, pszFormat, va);
+    if (!pszMsg)
+    {
+        VMSetError(pSSM->pVM, VERR_NO_MEMORY, RT_SRC_POS,
+                   N_("SSMR3SetLoadErrorV ran out of memory formatting: %s\n"), pszFormat);
+        return rc;
+    }
+
+    /*
      * Forward to VMSetError with the additional info.
      */
@@ -6887 +6899 @@
     const char *pszName     = pUnit ? pUnit->szName      : "unknown";
     uint32_t    uInstance   = pUnit ? pUnit->u32Instance : 0;
-    va_list     vaCopy;
-    va_copy(vaCopy, va);
     if (   pSSM->enmOp == SSMSTATE_LOAD_EXEC
         && pSSM->u.Read.uCurUnitPass == SSM_PASS_FINAL)
-        rc = VMSetError(pSSM->pVM, rc, RT_SRC_POS_ARGS, N_("%s#u: %N [ver=%u pass=final]"),
-                        pszName, uInstance,
-                        pszFormat, &vaCopy,
-                        pSSM->u.Read.uCurUnitVer);
+        rc = VMSetError(pSSM->pVM, rc, RT_SRC_POS_ARGS, N_("%s#%u: %s [ver=%u pass=final]"),
+                        pszName, uInstance, pszMsg, pSSM->u.Read.uCurUnitVer);
     else if (pSSM->enmOp == SSMSTATE_LOAD_EXEC)
-        rc = VMSetError(pSSM->pVM, rc, RT_SRC_POS_ARGS, N_("%s#u: %N [ver=%u pass=#%u]"),
-                        pszName, uInstance,
-                        pszFormat, &vaCopy,
-                        pSSM->u.Read.uCurUnitVer, pSSM->u.Read.uCurUnitPass);
+        rc = VMSetError(pSSM->pVM, rc, RT_SRC_POS_ARGS, N_("%s#%u: %s [ver=%u pass=#%u]"),
+                        pszName, uInstance, pszMsg, pSSM->u.Read.uCurUnitVer, pSSM->u.Read.uCurUnitPass);
     else if (pSSM->enmOp == SSMSTATE_LOAD_PREP)
-        rc = VMSetError(pSSM->pVM, rc, RT_SRC_POS_ARGS, N_("%s#u: %N [prep]"),
-                        pszName, uInstance,
-                        pszFormat, &vaCopy);
+        rc = VMSetError(pSSM->pVM, rc, RT_SRC_POS_ARGS, N_("%s#%u: %s [prep]"),
+                        pszName, uInstance, pszMsg);
     else if (pSSM->enmOp == SSMSTATE_LOAD_DONE)
-        rc = VMSetError(pSSM->pVM, rc, RT_SRC_POS_ARGS, N_("%s#u: %N [done]"),
-                        pszName, uInstance,
-                        pszFormat, &vaCopy);
+        rc = VMSetError(pSSM->pVM, rc, RT_SRC_POS_ARGS, N_("%s#%u: %s [done]"),
+                        pszName, uInstance, pszMsg);
     else if (pSSM->enmOp == SSMSTATE_OPEN_READ)
-        rc = VMSetError(pSSM->pVM, rc, RT_SRC_POS_ARGS, N_("%s#u: %N [read]"),
-                        pszName, uInstance,
-                        pszFormat, &vaCopy);
+        rc = VMSetError(pSSM->pVM, rc, RT_SRC_POS_ARGS, N_("%s#%u: %s [read]"),
+                        pszName, uInstance, pszMsg);
     else
         AssertFailed();
-    va_end(vaCopy);
     pSSM->u.Read.fHaveSetError = true;
+    RTStrFree(pszMsg);
     return rc;
 }