Changeset 16774 in vbox for trunk/src/VBox/Runtime

Timestamp:

Feb 15, 2009 4:23:47 AM (16 years ago)

Author:

vboxsync

Message:

RTBase64: no trailing newline.

Location:

trunk/src/VBox/Runtime

Files:

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

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

@@ -423 +423 @@
 
         cch += (cch / RTBASE64_LINE_LEN) * RTBASE64_EOL_SIZE;
+        cch -= (cch % RTBASE64_LINE_LEN) == 0;
         return cch;
     }
@@ -432 +433 @@
 
     cch += (cch / RTBASE64_LINE_LEN) * RTBASE64_EOL_SIZE;
+    cch -= (cch % RTBASE64_LINE_LEN) == 0;
     return cch;
 }
@@ -485 +487 @@
         pbSrc  += 3;
 
-        if (cbBuf == cbLineFeed)
+        /* deal out linefeeds */
+        if (cbBuf == cbLineFeed && cbData)
         {
             if (cbBuf < RTBASE64_EOL_SIZE + 1)

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

@@ -128 +128 @@
     {
         RTPrintf("tstBase64: FAILURE - %s: RTBase64EncodedLength returned %zu bytes, expected %zu.\n",
-                 szTest, cchOut, cchOut2);
+                 szTest, cchOut2, cchOut);
         g_cErrors++;
     }
@@ -284 +284 @@
         "9P/0//T/9AD0APQA9f/1//X/9QD1APUA9v/2//b/9gD2APYA9//3//f/9wD3APcA" MY_NL
         "+P/4//j/+AD4APgA+f/5//n/+QD5APkA+v/6//r/+gD6APoA+//7//v/+wD7APsA" MY_NL
-        "/P/8//z//AD8APwA/f/9//3//QD9AP0A/v/+//7//gD+AP4A/////////wD/AP8A" MY_NL;
+        "/P/8//z//AD8APwA/f/9//3//QD9AP0A/v/+//7//gD+AP4A/////////wD/AP8A";
 
     tstBase64(s_abData3, sizeof(s_abData3),