summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorHye-Shik Chang <hyeshik@gmail.com>2006-06-05 01:09:46 +0000
committerHye-Shik Chang <hyeshik@gmail.com>2006-06-05 01:09:46 +0000
commit04d547e397b9bccb40958dd7643b2aef1c8e9063 (patch)
tree9e1d773d351b5fc0ba1cd6398b3196b2d33500b4 /Modules
parentee6ca70548f6abf1ea337cd358bf1ace2df0af1a (diff)
downloadcpython-git-04d547e397b9bccb40958dd7643b2aef1c8e9063.tar.gz
(Backport from trunk) Fix a potentially invalid memory access of
CJKCodecs' shift-jis decoder.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/cjkcodecs/_codecs_jp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/cjkcodecs/_codecs_jp.c b/Modules/cjkcodecs/_codecs_jp.c
index 860a979f87..72b4db0b23 100644
--- a/Modules/cjkcodecs/_codecs_jp.c
+++ b/Modules/cjkcodecs/_codecs_jp.c
@@ -640,10 +640,11 @@ DECODER(shift_jis_2004)
REQUIRE_OUTBUF(1)
JISX0201_DECODE(c, **outbuf)
else if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xfc)){
- unsigned char c1, c2 = IN2;
+ unsigned char c1, c2;
ucs4_t code;
REQUIRE_INBUF(2)
+ c2 = IN2;
if (c2 < 0x40 || (c2 > 0x7e && c2 < 0x80) || c2 > 0xfc)
return 2;