Changeset 40058 in vbox

Timestamp:

Feb 10, 2012 1:10:26 PM (13 years ago)

Author:

vboxsync

Message:

RTBase64: fix trailing newline suppression in RTBase64EncodedLength, plus testcase

Location:

trunk/src/VBox/Runtime

Files:

• common/string/base64.cpp (modified) (2 diffs)
• testcase/tstRTBase64.cpp (modified) (2 diffs)

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

@@ -424 +424 @@
         cch /= 6;
 
-        cch += (cch / RTBASE64_LINE_LEN) * RTBASE64_EOL_SIZE;
-        cch -= (cch % RTBASE64_LINE_LEN) == 0;
+        cch += ((cch - 1) / RTBASE64_LINE_LEN) * RTBASE64_EOL_SIZE;
         return cch;
     }
@@ -434 +433 @@
     cch /= 6;
 
-    cch += (cch / RTBASE64_LINE_LEN) * RTBASE64_EOL_SIZE;
-    cch -= (cch % RTBASE64_LINE_LEN) == 0;
+    cch += ((cch - 1) / RTBASE64_LINE_LEN) * RTBASE64_EOL_SIZE;
     return cch;
 }

trunk/src/VBox/Runtime/testcase/tstRTBase64.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -173 +173 @@
 
     /*
+     * Test for buffer overruns.
+     */
+    static uint8_t s_abData4[32768];
+    for (size_t i = 0; i < sizeof(s_abData4); i++)
+        s_abData4[i] = i % 256;
+    for (size_t cbSrc = 1; cbSrc <= sizeof(s_abData4); cbSrc++)
+    {
+        RTTestSubF(hTest, "Test 3-%zu", cbSrc);
+        char szEnc[49152];
+        memset(szEnc, '\0', sizeof(szEnc));
+        size_t cchEnc = RTBase64EncodedLength(cbSrc);
+        if (cchEnc >= sizeof(szEnc))
+            RTTestIFailed("RTBase64EncodedLength returned %zu bytes, too big\n", cchEnc);
+        size_t cchOut = 0;
+        rc = RTBase64Encode(s_abData4, cbSrc, szEnc, cchEnc, &cchOut);
+        if (rc != VERR_BUFFER_OVERFLOW)
+            RTTestIFailed("RTBase64Encode has no buffer overflow with too small buffer -> %Rrc\n", rc);
+        rc = RTBase64Encode(s_abData4, cbSrc, szEnc, cchEnc + 1, &cchOut);
+        if (RT_FAILURE(rc))
+            RTTestIFailed("RTBase64Encode -> %Rrc\n", rc);
+        if (cchOut != cchEnc)
+            RTTestIFailed("RTBase64EncodedLength returned %zu bytes, expected %zu.\n",
+                          cchEnc, cchOut);
+        if (szEnc[cchOut + 1] != '\0')
+            RTTestIFailed("RTBase64Encode returned string which is not zero terminated\n");
+        if (strlen(szEnc) != cchOut)
+            RTTestIFailed("RTBase64Encode returned incorrect string, length %lu\n", cchOut);
+    }
+
+    /*
      * Finally, a more extensive test.
      */
-    RTTestSub(hTest, "Test 3");
+    RTTestSub(hTest, "Test 4");
     static uint8_t s_abData3[12*256];
     for (unsigned i = 0; i < 256; i++)