Changeset 51787 in vbox for trunk/src

Timestamp:

Jul 1, 2014 8:18:21 PM (11 years ago)

Author:

vboxsync

Message:

bugfix

File:

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

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

@@ -234 +234 @@
     uint8_t     u8;
     unsigned    c6Bits    = 0;
-    unsigned    ch;
     AssertCompile(sizeof(char) == sizeof(uint8_t));
 
@@ -240 +239 @@
     {
         /* The first 6-bit group. */
-        while ((u8 = cchStringMax > 0 ? g_au8CharToVal[ch = *pszString] : BASE64_INVALID) == BASE64_SPACE)
+        while ((u8 = cchStringMax > 0 ? g_au8CharToVal[*pszString] : BASE64_INVALID) == BASE64_SPACE)
             pszString++, cchStringMax--;
         if (u8 >= 64)
@@ -252 +251 @@
 
         /* The second 6-bit group. */
-        while ((u8 = cchStringMax > 0 ? g_au8CharToVal[ch = *pszString] : BASE64_INVALID) == BASE64_SPACE)
+        while ((u8 = cchStringMax > 0 ? g_au8CharToVal[*pszString] : BASE64_INVALID) == BASE64_SPACE)
             pszString++, cchStringMax--;
         if (u8 >= 64)
@@ -266 +265 @@
         /* The third 6-bit group. */
         u8 = BASE64_INVALID;
-        while ((u8 = cchStringMax > 0 ? g_au8CharToVal[ch = *pszString] : BASE64_INVALID) == BASE64_SPACE)
+        while ((u8 = cchStringMax > 0 ? g_au8CharToVal[*pszString] : BASE64_INVALID) == BASE64_SPACE)
             pszString++, cchStringMax--;
         if (u8 >= 64)
@@ -280 +279 @@
         /* The fourth 6-bit group. */
         u8 = BASE64_INVALID;
-        while ((u8 = cchStringMax > 0 ? g_au8CharToVal[ch = *pszString] : BASE64_INVALID) == BASE64_SPACE)
+        while ((u8 = cchStringMax > 0 ? g_au8CharToVal[*pszString] : BASE64_INVALID) == BASE64_SPACE)
             pszString++, cchStringMax--;
         if (u8 >= 64)
@@ -308 +307 @@
     if (u8 == BASE64_PAD)
     {
+        unsigned ch;
         cbPad = 1;
         pszString++;
@@ -332 +332 @@
      */
     if (    u8 == BASE64_INVALID
-        &&  !ppszEnd
-        &&  ch)
+        &&  !ppszEnd)
         return VERR_INVALID_BASE64_ENCODING;