aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/fns.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 04736e027bf..84d0be41090 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12000-10-22 15:07:47 ShengHuo ZHU <zsh@cs.rochester.edu>
2
3 * fns.c (Fbase64_decode_string): The decoded result should be
4 unibyte.
5
12000-10-23 Andrew Choi <akochoi@i-cable.com> 62000-10-23 Andrew Choi <akochoi@i-cable.com>
2 7
3 * dispextern.h [macintosh]: Include macgui.h instead of macterm.h. 8 * dispextern.h [macintosh]: Include macgui.h instead of macterm.h.
diff --git a/src/fns.c b/src/fns.c
index 0568a6e31df..854c46cdc6b 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3550,8 +3550,9 @@ DEFUN ("base64-decode-string", Fbase64_decode_string, Sbase64_decode_string,
3550 else 3550 else
3551 decoded = (char *) xmalloc (length); 3551 decoded = (char *) xmalloc (length);
3552 3552
3553 /* The decoded result should be unibyte. */
3553 decoded_length = base64_decode_1 (XSTRING (string)->data, decoded, length, 3554 decoded_length = base64_decode_1 (XSTRING (string)->data, decoded, length,
3554 STRING_MULTIBYTE (string), NULL); 3555 0, NULL);
3555 if (decoded_length > length) 3556 if (decoded_length > length)
3556 abort (); 3557 abort ();
3557 else if (decoded_length >= 0) 3558 else if (decoded_length >= 0)