X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/23e9ccce9de7e5190c2ea7dda03e54ece5b5a3da..9a6d835cfe7761f6a85f84233d9d93722efe6ecc:/sbr/base64.c

diff --git a/sbr/base64.c b/sbr/base64.c
index 9047eb5f..f1fec4ed 100644
--- a/sbr/base64.c
+++ b/sbr/base64.c
@@ -113,7 +113,7 @@ writeBase64aux (FILE *in, FILE *out, int crlf)
      4 * [length/3]  +  length/57  +  2
    But double the length will certainly be sufficient. */
 int
-writeBase64 (unsigned char *in, size_t length, unsigned char *out)
+writeBase64 (const unsigned char *in, size_t length, unsigned char *out)
 {
     unsigned int n = BPERLIN;
 
@@ -121,7 +121,7 @@ writeBase64 (unsigned char *in, size_t length, unsigned char *out)
 	unsigned long bits;
 	unsigned char *bp;
 	unsigned int cc;
-	for (cc = 0, bp = in; length > 0 && cc < 3; ++cc, ++bp, --length)
+	for (cc = 0; length > 0 && cc < 3; ++cc, --length)
           /* empty */ ;
 
 	if (cc == 0) {
@@ -168,13 +168,13 @@ writeBase64 (unsigned char *in, size_t length, unsigned char *out)
  */
 
 int
-writeBase64raw (unsigned char *in, size_t length, unsigned char *out)
+writeBase64raw (const unsigned char *in, size_t length, unsigned char *out)
 {
     while (1) {
 	unsigned long bits;
 	unsigned char *bp;
 	unsigned int cc;
-	for (cc = 0, bp = in; length > 0 && cc < 3; ++cc, ++bp, --length)
+	for (cc = 0; length > 0 && cc < 3; ++cc, --length)
           /* empty */ ;
 
 	if (cc == 0) {
@@ -339,7 +339,7 @@ hexify (const unsigned char *input, size_t len, char **output) {
     size_t i;
 
     for (i = 0; i < len; ++i, ++cp) {
-        if (isprint(*cp)) {
+        if (isascii(*cp) && isprint(*cp)) {
             charstring_push_back (tmp, (const char) *cp);
         } else {
             char s[16];