Changeset 51790 in vbox for trunk/src

Timestamp:

Jul 1, 2014 8:32:22 PM (11 years ago)

Author:

vboxsync

Message:

Better fix

File:

• trunk/src/VBox/Runtime/common/string/base64.cpp (modified) (7 diffs)

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

@@ -232 +232 @@
     uint8_t     u8Trio[3] = { 0, 0, 0 }; /* shuts up gcc */
     uint8_t    *pbData    = (uint8_t *)pvData;
+    unsigned    ch;
     uint8_t     u8;
     unsigned    c6Bits    = 0;
@@ -239 +240 @@
     {
         /* The first 6-bit group. */
-        while ((u8 = cchStringMax > 0 ? g_au8CharToVal[*pszString] : BASE64_INVALID) == BASE64_SPACE)
+        while ((u8 = g_au8CharToVal[ch = cchStringMax > 0 ? *pszString : 0]) == BASE64_SPACE)
             pszString++, cchStringMax--;
         if (u8 >= 64)
@@ -251 +252 @@
 
         /* The second 6-bit group. */
-        while ((u8 = cchStringMax > 0 ? g_au8CharToVal[*pszString] : BASE64_INVALID) == BASE64_SPACE)
+        while ((u8 = g_au8CharToVal[ch = cchStringMax > 0 ? *pszString : 0]) == BASE64_SPACE)
             pszString++, cchStringMax--;
         if (u8 >= 64)
@@ -265 +266 @@
         /* The third 6-bit group. */
         u8 = BASE64_INVALID;
-        while ((u8 = cchStringMax > 0 ? g_au8CharToVal[*pszString] : BASE64_INVALID) == BASE64_SPACE)
+        while ((u8 = g_au8CharToVal[ch = cchStringMax > 0 ? *pszString : 0]) == BASE64_SPACE)
             pszString++, cchStringMax--;
         if (u8 >= 64)
@@ -279 +280 @@
         /* The fourth 6-bit group. */
         u8 = BASE64_INVALID;
-        while ((u8 = cchStringMax > 0 ? g_au8CharToVal[*pszString] : BASE64_INVALID) == BASE64_SPACE)
+        while ((u8 = g_au8CharToVal[ch = cchStringMax > 0 ? *pszString : 0]) == BASE64_SPACE)
             pszString++, cchStringMax--;
         if (u8 >= 64)
@@ -305 +306 @@
      */
     unsigned cbPad = 0;
-    unsigned ch = 0;
     if (u8 == BASE64_PAD)
     {
@@ -326 +326 @@
             return VERR_INVALID_BASE64_ENCODING;
     }
-    else if (cchStringMax > 0)
-        ch = *pszString;
 
     /*