(Backport from trunk) Fix a potentially invalid memory access of

CJKCodecs' shift-jis decoder.

diff --git a/Misc/NEWS b/Misc/NEWS
index e9b9b114c29f20f2398233ade217a41479df7500..3171e036593fc4709e1d5eb2ede6d35417d63d3d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,6 +17,8 @@ Core and builtins
 Extension Modules
 -----------------
 
+- Fixed a potentially invalid memory access of CJKCodecs' shift-jis decoder.
+
 - Calling Tk_Init twice is refused if the first call failed as that
   may deadlock.
 

diff --git a/Modules/cjkcodecs/_codecs_jp.c b/Modules/cjkcodecs/_codecs_jp.c
index 860a979f87d830fb798aa064d7503086dcd92a18..72b4db0b23417f545471007b006e26ff2637104e 100644 (file)
--- 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;