From: ShengHuo ZHU <zsh@cs.rochester.edu>
Date: Sun, 22 Oct 2000 19:08:26 +0000 (+0000)
Subject: 2000-10-22 15:07:47  ShengHuo ZHU  <zsh@cs.rochester.edu>
X-Git-Tag: emacs-pretest-21.0.90~677
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ec118cdd6f4a8ca65199eecb01f0c68d05ab4f2;p=emacs.git

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 04736e027bf..84d0be41090 100644
--- 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 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,
   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)