(decode_coding_iso2022): More strict check for handling single

shifting.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/coding.c b/src/coding.c
index d67e07687cd..6c251a583dd 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1471,6 +1471,8 @@ decode_coding_iso2022 (coding, source, destination, src_bytes, dst_bytes)
                 goto label_invalid_code;
               charset = CODING_SPEC_ISO_DESIGNATION (coding, 2);
               ONE_MORE_BYTE (c1);
+              if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0))
+                goto label_invalid_code;
               break;
 
             case 'O':           /* invocation of single-shift-3 */
@@ -1479,6 +1481,8 @@ decode_coding_iso2022 (coding, source, destination, src_bytes, dst_bytes)
                 goto label_invalid_code;
               charset = CODING_SPEC_ISO_DESIGNATION (coding, 3);
               ONE_MORE_BYTE (c1);
+              if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0))
+                goto label_invalid_code;
               break;
 
             case '0': case '2': case '3': case '4': /* start composition */