diff options
| author | ShengHuo ZHU <zsh@cs.rochester.edu> | 2000-10-22 19:08:26 +0000 |
|---|---|---|
| committer | ShengHuo ZHU <zsh@cs.rochester.edu> | 2000-10-22 19:08:26 +0000 |
| commit | 8ec118cdd6f4a8ca65199eecb01f0c68d05ab4f2 (patch) | |
| tree | ad2d4f9362ed9b8fd0cb686afb6997bd0046964d | |
| parent | 1a578e9be2034298bb8ac29b7b84086a4ab290f4 (diff) | |
| download | emacs-8ec118cdd6f4a8ca65199eecb01f0c68d05ab4f2.tar.gz | |
2000-10-22 15:07:47 ShengHuo ZHU <zsh@cs.rochester.edu>
* fns.c (Fbase64_decode_string): The decoded result should be
unibyte.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fns.c | 3 |
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 @@ +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) |