diff options
| author | Kenichi Handa | 2006-02-02 12:47:04 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-02-02 12:47:04 +0000 |
| commit | 999a0fe581bf2788cd438d03f7f33d4a1d0f0646 (patch) | |
| tree | efa7a05e593aca1718f94192e42682695e0f30a0 /src/coding.c | |
| parent | 0ddb3356b25df5004b68be986d57e38cc2bb6395 (diff) | |
| download | emacs-999a0fe581bf2788cd438d03f7f33d4a1d0f0646.tar.gz emacs-999a0fe581bf2788cd438d03f7f33d4a1d0f0646.zip | |
(decode_composition_emacs_mule): Fix handling of
incorrect format data.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index 5985e895ef6..385481d1a63 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -872,7 +872,7 @@ decode_composition_emacs_mule (coding, src, src_end, | |||
| 872 | component[ncomponent] = c; | 872 | component[ncomponent] = c; |
| 873 | } | 873 | } |
| 874 | } | 874 | } |
| 875 | else | 875 | else if (c >= 0x80) |
| 876 | { | 876 | { |
| 877 | /* This may be an old Emacs 20 style format. See the comment at | 877 | /* This may be an old Emacs 20 style format. See the comment at |
| 878 | the section 2 of this file. */ | 878 | the section 2 of this file. */ |
| @@ -924,6 +924,8 @@ decode_composition_emacs_mule (coding, src, src_end, | |||
| 924 | else | 924 | else |
| 925 | return 0; | 925 | return 0; |
| 926 | } | 926 | } |
| 927 | else | ||
| 928 | return 0; | ||
| 927 | 929 | ||
| 928 | if (buf == bufp || dst + (bufp - buf) <= (dst_bytes ? dst_end : src)) | 930 | if (buf == bufp || dst + (bufp - buf) <= (dst_bytes ? dst_end : src)) |
| 929 | { | 931 | { |