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

Timestamp:

Feb 21, 2012 12:04:21 AM (13 years ago)

Author:

vboxsync

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

76350

Message:

RTStrFormatNumber: Assert some buffer sanity.

File:

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

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

@@ -148 +148 @@
  * @param     fFlags         Flags (NTFS_*).
  */
-RTDECL(int) RTStrFormatNumber(char *psz, uint64_t u64Value, unsigned int uiBase, signed int cchWidth, signed int cchPrecision, unsigned int fFlags)
+RTDECL(int) RTStrFormatNumber(char *psz, uint64_t u64Value, unsigned int uiBase, signed int cchWidth, signed int cchPrecision,
+                              unsigned int fFlags)
 {
     return rtStrFormatNumber(psz, *(KSIZE64 *)(void *)&u64Value, uiBase, cchWidth, cchPrecision, fFlags);
@@ -167 +168 @@
  * @param     fFlags         Flags (NTFS_*).
  */
-static int rtStrFormatNumber(char *psz, KSIZE64 ullValue, unsigned int uiBase, signed int cchWidth, signed int cchPrecision, unsigned int fFlags)
+static int rtStrFormatNumber(char *psz, KSIZE64 ullValue, unsigned int uiBase, signed int cchWidth, signed int cchPrecision,
+                             unsigned int fFlags)
 {
     const char     *pachDigits = "0123456789abcdef";
     char           *pszStart = psz;
+    int             cchMax;
     int             cchValue;
     unsigned long   ul;
@@ -251 +254 @@
      * width - only if ZEROPAD
      */
+    cchMax    = 64 - (cchValue + i + 1);   /* HACK! 64 bytes seems to be the usual buffer size... */
     cchWidth -= i + cchValue;
     if (fFlags & RTSTR_F_ZEROPAD)
-        while (--cchWidth >= 0)
+        while (--cchWidth >= 0 && i < cchMax)
         {
+            AssertBreak(i < cchMax);
             psz[i++] = '0';
             cchPrecision--;
@@ -260 +265 @@
     else if (!(fFlags & RTSTR_F_LEFT) && cchWidth > 0)
     {
-        for (j = i-1; j >= 0; j--)
+        AssertStmt(cchWidth < cchMax, cchWidth = cchMax - 1);
+        for (j = i - 1; j >= 0; j--)
             psz[cchWidth + j] = psz[j];
         for (j = 0; j < cchWidth; j++)
@@ -266 +272 @@
         i += cchWidth;
     }
-    psz += i;
-
 
     /*
@@ -273 +277 @@
      */
     while (--cchPrecision >= cchValue)
-        *psz++ = '0';
+    {
+        AssertBreak(i < cchMax);
+        psz[i++] = '0';
+    }
+
+    psz += i;
 
     /*