Commit 99107004 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

* coding.c (CODING_ISO_FLAG_LEVEL_4): New macro.

(decode_coding_iso_2022): Check the single-shift area.  (Bug#8522)
parent eaaa8f3e
2013-07-20 Kenichi Handa <handa@gnu.org>
* international/mule.el (coding-system-iso-2022-flags): Add
`level-4'. (Bug#8522)
2013-07-18 Michael Albinus <michael.albinus@gmx.de>
* filenotify.el (file-notify--library): Renamed from
......
2013-07-20 Kenichi Handa <handa@gnu.org>
* coding.c (CODING_ISO_FLAG_LEVEL_4): New macro.
(decode_coding_iso_2022): Check the single-shift area. (Bug#8522)
2013-07-18 Paul Eggert <eggert@cs.ucla.edu>
* filelock.c: Fix unlikely file descriptor leaks.
......
......@@ -493,6 +493,8 @@ enum iso_code_class_type
#define CODING_ISO_FLAG_USE_OLDJIS 0x10000
#define CODING_ISO_FLAG_LEVEL_4 0x20000
#define CODING_ISO_FLAG_FULL_SUPPORT 0x100000
/* A character to be produced on output if encoding of the original
......@@ -3733,7 +3735,9 @@ decode_coding_iso_2022 (struct coding_system *coding)
else
charset = CHARSET_FROM_ID (charset_id_2);
ONE_MORE_BYTE (c1);
if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0))
if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0)
|| ((CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_LEVEL_4)
? c1 >= 0x80 : c1 < 0x80))
goto invalid_code;
break;
......@@ -3747,7 +3751,9 @@ decode_coding_iso_2022 (struct coding_system *coding)
else
charset = CHARSET_FROM_ID (charset_id_3);
ONE_MORE_BYTE (c1);
if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0))
if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0)
|| ((CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_LEVEL_4)
? c1 >= 0x80 : c1 < 0x80))
goto invalid_code;
break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment