test-flist: Increase coverage on argv[] processing.

[nmh] / sbr / base64.c

diff --git a/sbr/base64.c b/sbr/base64.c
index 79d7aa944a81d8e4c469c2756be957650431b74d..e8ddee7ab4124734044190e565691a1d4f102a1f 100644 (file)
--- a/sbr/base64.c
+++ b/sbr/base64.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <inttypes.h>
 
-static char nib2b64[0x40+1] =
+static const char nib2b64[0x40+1] =
        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 int
@@ -209,7 +209,7 @@ writeBase64raw (const unsigned char *in, size_t length, unsigned char *out)
 }
 
 
-static unsigned char b642nib[0x80] = {
+static const unsigned char b642nib[0x80] = {
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -259,7 +259,7 @@ decodeBase64 (const char *encoded, unsigned char **decoded, size_t *len,
                 }
                 if (skip  ||  (((unsigned char) *cp) & 0x80)  ||
                     (value = b642nib[((unsigned char) *cp) & 0x7f]) > 0x3f) {
-                    advise (NULL, "invalid BASE64 encoding in %s", encoded);
+                    advise (NULL, "invalid BASE64 encoding in %s", cp);
                     charstring_free (decoded_c);
                     *decoded = NULL;
 
@@ -307,7 +307,12 @@ test_end:
     }
 
     if (! self_delimiting  &&  bitno != 18) {
-        advise (NULL, "premature ending (bitno %d) in %s", bitno, encoded);
+        int i;
+
+        /* Show some context for the error. */
+        for (i = 0; i < 20  &&  cp > encoded; ++i, --cp) {}
+        advise (NULL, "premature ending (bitno %d) near %s", bitno,
+                cp ? cp : encoded);
         charstring_free (decoded_c);
         *decoded = NULL;