document On{Open,Save}Document()

[wxWidgets.git] / src / common / base64.cpp

diff --git a/src/common/base64.cpp b/src/common/base64.cpp
index 89025b0b56f94e568a6ac323023507c19f738166..2832bffb3b8dc9c44fd042f5b56bde938abd4382 100644 (file)
--- a/src/common/base64.cpp
+++ b/src/common/base64.cpp
@@ -88,7 +88,7 @@ wxBase64Decode(void *dst_, size_t dstLen,
         PAD
     };
 
         PAD
     };
 

-    static const char decode[256] =
+    static const unsigned char decode[256] =

     {
         WSP,INV,INV,INV,INV,INV,INV,INV,INV,WSP,WSP,INV,WSP,WSP,INV,INV,
         INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,
     {
         WSP,INV,INV,INV,INV,INV,INV,INV,INV,WSP,WSP,INV,WSP,WSP,INV,INV,
         INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,


@@ -118,7 +118,7 @@ wxBase64Decode(void *dst_, size_t dstLen,
     const char *p;
     for ( p = src; srcLen; p++, srcLen-- )
     {
     const char *p;
     for ( p = src; srcLen; p++, srcLen-- )
     {

-        const char c = decode[(int)*p];     // cast just to suppress warnings
+        const unsigned char c = decode[wx_static_cast(unsigned char, *p)];

         switch ( c )
         {
             case WSP:
         switch ( c )
         {
             case WSP:


@@ -132,7 +132,7 @@ wxBase64Decode(void *dst_, size_t dstLen,
 
                 // force the loop to stop and an error to be returned
                 n = -1;
 
                 // force the loop to stop and an error to be returned
                 n = -1;

-                srcLen = 0;
+                srcLen = 1;

                 break;
 
             case PAD:
                 break;
 
             case PAD:


@@ -156,7 +156,7 @@ wxBase64Decode(void *dst_, size_t dstLen,
                 {
                     // force the loop terminate with an error
                     n = -1;
                 {
                     // force the loop terminate with an error
                     n = -1;

-                    srcLen = 0;
+                    srcLen = 1;

                 }
                 break;
 
                 }
                 break;
 


@@ -165,7 +165,7 @@ wxBase64Decode(void *dst_, size_t dstLen,
                 {
                     // nothing is allowed after the end so provoke error return
                     n = -1;
                 {
                     // nothing is allowed after the end so provoke error return
                     n = -1;

-                    srcLen = 0;
+                    srcLen = 1;

                     break;
                 }
 
                     break;
                 }
 


@@ -194,7 +194,11 @@ wxBase64Decode(void *dst_, size_t dstLen,
     if ( n )
     {
         if ( posErr )
     if ( n )
     {
         if ( posErr )

-            *posErr = p - src;
+        {
+            // notice that the error was on a previous position as we did one
+            // extra "p++" in the loop line after it
+            *posErr = p - src - 1;
+        }

 
         return wxCONV_FAILED;
     }
 
         return wxCONV_FAILED;
     }