Changeset 17522 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Mar 7, 2009 6:50:52 AM (16 years ago)

Author:

vboxsync

Message:

strformattype.cpp: be a bit more gentle if the type is missing.

File:

• trunk/src/VBox/Runtime/common/string/strformattype.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/string/strformattype.cpp

@@ -422 +422 @@
     char const *pszType;
     char        ch;
+    void       *pvValue = va_arg(*pArgs, void *);
 
     /*
@@ -454 +455 @@
 #endif
         void *pvUser = ASMAtomicReadPtr(&g_aTypes[i].pvUser);
-        void *pvValue = va_arg(*pArgs, void *);
+
+        rtstrFormatTypeReadUnlock();
 
         cch = pfnHandler(pfnOutput, pvArgOutput, g_aTypes[i].szType, pvValue, cchWidth, cchPrecision, fFlags, pvUser);
     }
     else
-        cch = 0;
-
-    rtstrFormatTypeReadUnlock();
-
-    Assert(i >= 0);
+    {
+        rtstrFormatTypeReadUnlock();
+
+        cch  = pfnOutput(pvArgOutput, "<missing:%R[", sizeof("<missing:%R[") - 1);
+        cch += pfnOutput(pvArgOutput, pszType, pszTypeEnd - pszType);
+        cch += pfnOutput(pvArgOutput, "]>", sizeof("]>") - 1);
+    }
+
     return cch;
 }