Changeset 2238:6390b65b36b6 for base64.c

Timestamp:

2001-01-08 08:57:20 (8 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Fix and/or check more fishy code.

Files:

• base64.c (modified) (2 diffs)

base64.c

@@ -46 +46 @@
 
 /* raw bytes to null-terminated base 64 string */
-void mutt_to_base64 (unsigned char *out, const unsigned char *in, int len)
+void mutt_to_base64 (unsigned char *out, const unsigned char *in, size_t len,
+                     size_t olen)
 {
-  while (len >= 3)
+  while (len >= 3 && olen > 10)
   {
     *out++ = B64Chars[in[0] >> 2];
@@ -54 +55 @@
     *out++ = B64Chars[((in[1] << 2) & 0x3c) | (in[2] >> 6)];
     *out++ = B64Chars[in[2] & 0x3f];
-    len -= 3;
-    in += 3;
+    olen  -= 4;
+    len   -= 3;
+    in    += 3;
   }
 
   /* clean up remainder */
-  if (len > 0)
+  if (len > 0 && olen > 4)
   {
     unsigned char fragment;