2000-10-22 15:07:47 ShengHuo ZHU <zsh@cs.rochester.edu>

	* fns.c (Fbase64_decode_string): The decoded result should be
	unibyte.

diff --git a/src/ChangeLog b/src/ChangeLog
index 04736e027bfb00db796057d152680ad828c7cf5e..84d0be410902338ef9f73e1fd0c82e1b22ba96e2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-22 15:07:47  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * fns.c (Fbase64_decode_string): The decoded result should be
+       unibyte.
+
 2000-10-23  Andrew Choi  <akochoi@i-cable.com>
 
        * dispextern.h [macintosh]: Include macgui.h instead of macterm.h.

diff --git a/src/fns.c b/src/fns.c
index 0568a6e31df6dc029a58c9111f8c408cfcd05715..854c46cdc6b497d26864713de5724e9777eaf729 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -3550,8 +3550,9 @@ DEFUN ("base64-decode-string", Fbase64_decode_string, Sbase64_decode_string,
   else
     decoded = (char *) xmalloc (length);
 
+  /* The decoded result should be unibyte. */
   decoded_length = base64_decode_1 (XSTRING (string)->data, decoded, length,
-                                   STRING_MULTIBYTE (string), NULL);
+                                   0, NULL);
   if (decoded_length > length)
     abort ();
   else if (decoded_length >= 0)