(decode_coding_iso_2022): Ignore ISO_CODE_SS2_7 (0x19)

in 8-bit encoding.

diff --git a/src/ChangeLog b/src/ChangeLog
index a143e1d5739438b072c37b9e3e4f6ef26e74a7bd..352a7239acfecec5b01bef5852d503e93a795e6e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-14  Kenichi Handa  <handa@m17n.org>
+
+       * coding.c (decode_coding_iso_2022): Ignore ISO_CODE_SS2_7 (0x19)
+       in 8-bit encoding.
+
 2009-12-13  Pat Thoyts <patthoyts@users.sourceforge.net> (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 1d838db36854e21c39437df589da683ee699150a..a161f5a34cd69a36c193e025820228784fc697d3 100644 (file)
--- 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;