Changeset 59703 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Feb 16, 2016 1:50:10 PM (9 years ago)

Author:

vboxsync

Message:

IPRT: strformat.cpp: Share the temporary buffer and use it for '%c' output buffering to prevent trouble if the output callback checks for null termination.

File:

• trunk/src/VBox/Runtime/common/string/strformat.cpp (modified) (6 diffs)

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

@@ -364 +364 @@
                             const char *pszFormat, va_list InArgs)
 {
+    char        szTmp[64]; /* Worker functions assumes 64 byte buffer! Ugly but faster. */
     va_list     args;
     KSIZE       cch = 0;
@@ -520 +521 @@
                     case 'c':
                     {
-                        char ch;
-
                         if (!(fFlags & RTSTR_F_LEFT))
                             while (--cchWidth > 0)
                                 cch += pfnOutput(pvArgOutput, " ", 1);
 
-                        ch = (char)va_arg(args, int);
-                        cch += pfnOutput(pvArgOutput, SSToDS(&ch), 1);
+                        szTmp[0] = (char)va_arg(args, int);
+                        szTmp[1] = '\0';                     /* Some output functions wants terminated strings. */
+                        cch += pfnOutput(pvArgOutput, SSToDS(&szTmp[0]), 1);
 
                         while (--cchWidth > 0)
@@ -559 +559 @@
                                 RTUNICP Cp;
                                 RTUtf16GetCpEx(&pwszStr, &Cp);
-                                char szUtf8[8]; /* Cp=0x7fffffff -> 6 bytes. */
-                                char *pszEnd = RTStrPutCp(szUtf8, Cp);
-                                cch += pfnOutput(pvArgOutput, szUtf8, pszEnd - szUtf8);
+                                char *pszEnd = RTStrPutCp(szTmp, Cp);
+                                cch += pfnOutput(pvArgOutput, szTmp, pszEnd - szTmp);
 #else
                                 char ch = (char)*pwszStr++;
@@ -591 +590 @@
 /**@todo \#ifndef IN_RC*/
 #ifdef IN_RING3
-                                char szUtf8[8]; /* Cp=0x7fffffff -> 6 bytes. */
-                                char *pszEnd = RTStrPutCp(szUtf8, *puszStr++);
-                                cch += pfnOutput(pvArgOutput, szUtf8, pszEnd - szUtf8);
+                                char *pszEnd = RTStrPutCp(szTmp, *puszStr++);
+                                cch += pfnOutput(pvArgOutput, szTmp, pszEnd - szTmp);
 #else
                                 char ch = (char)*puszStr++;
@@ -633 +631 @@
                     case 'X':
                     {
-                        char        achNum[64]; /* FIXME */
                         int         cchNum;
                         uint64_t    u64Value;
@@ -754 +751 @@
                             }
                         }
-                        cchNum = RTStrFormatNumber((char *)SSToDS(&achNum), u64Value, uBase, cchWidth, cchPrecision, fFlags);
-                        cch += pfnOutput(pvArgOutput, (char *)SSToDS(&achNum), cchNum);
+                        cchNum = RTStrFormatNumber((char *)SSToDS(&szTmp), u64Value, uBase, cchWidth, cchPrecision, fFlags);
+                        cch += pfnOutput(pvArgOutput, (char *)SSToDS(&szTmp), cchNum);
                         break;
                     }