From 07814db9f41af0d9ae4434ebb44cd9069c2914e8 Mon Sep 17 00:00:00 2001 From: HIRANO Takahito Date: Sat, 29 Jan 2011 17:56:58 +0000 Subject: [PATCH] Fix range check for ISO-2022-JP stream. Signed-off-by: HIRANO Takahito --- .../fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java b/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java index 707e2b21e..b5585898b 100644 --- a/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java +++ b/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java @@ -60,7 +60,7 @@ class Iso2022JpToShiftJisInputStream extends InputStream if (in1 == '\n' || in1 == '\r') charset = Charset.ASCII; - if (in1 < 0x21 || in1 >= 0x7e) + if (in1 < 0x21 || in1 >= 0x7f) return in1; switch (charset) @@ -71,7 +71,7 @@ class Iso2022JpToShiftJisInputStream extends InputStream return in1 + 0x80; case JISX0208: int in2 = mIn.read(); - if (in2 < 0x21 || in2 >= 0x7e) + if (in2 < 0x21 || in2 >= 0x7f) throw new MalformedInputException(0); int out1 = (in1 + 1) / 2 + (in1 < 0x5f ? 0x70 : 0xb0);