From a63dba42503aa7b2fea05cd70791c74acfa84f6f Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 14 Dec 2009 01:20:29 +0000 Subject: [PATCH] (decode_coding_iso_2022): Ignore ISO_CODE_SS2_7 (0x19) in 8-bit encoding. --- src/ChangeLog | 5 +++++ src/coding.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index a143e1d573..352a7239ac 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-12-14 Kenichi Handa + + * coding.c (decode_coding_iso_2022): Ignore ISO_CODE_SS2_7 (0x19) + in 8-bit encoding. + 2009-12-13 Pat Thoyts (tiny change) * xfns.c (x_create_tip_frame): Set the extended window manager hint for diff --git a/src/coding.c b/src/coding.c index 1d838db368..a161f5a34c 100644 --- a/src/coding.c +++ b/src/coding.c @@ -3726,6 +3726,8 @@ decode_coding_iso_2022 (coding) continue; case ISO_single_shift_2_7: + if (! (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SEVEN_BITS)) + goto invalid_code; case ISO_single_shift_2: if (! (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SINGLE_SHIFT)) goto invalid_code; -- 2.20.1