From: Alexey Izbyshev <izbyshev@ispras.ru>
Date: Sat, 10 Nov 2018 05:47:12 +0000 (+0300)
Subject: [2.7] bpo-35194: Fix a wrong constant in cp932 codec. (GH-10420) (GH-10433)
X-Git-Tag: v2.7.16rc1~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d165262d949440e5aea6533b10e19e4cd5cf12d;p=thirdparty%2FPython%2Fcpython.git

[2.7] bpo-35194: Fix a wrong constant in cp932 codec. (GH-10420) (GH-10433)

This typo doesn't affect the result because wrong bits are discarded
on implicit conversion to unsigned char, but it trips UBSan
with -fsanitize=implicit-integer-truncation.
(cherry picked from commit 7a69cf47a9bbc95f95fd67c982bff121b2a903cb)

Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>
---

diff --git a/Modules/cjkcodecs/_codecs_jp.c b/Modules/cjkcodecs/_codecs_jp.c
index a05e01b32e5a..3acd19e6258e 100644
--- a/Modules/cjkcodecs/_codecs_jp.c
+++ b/Modules/cjkcodecs/_codecs_jp.c
@@ -40,7 +40,7 @@ ENCODER(cp932)
             if (c == 0xf8f0)
                 OUT1(0xa0)
             else
-                OUT1(c - 0xfef1 + 0xfd)
+                OUT1(c - 0xf8f1 + 0xfd)
             NEXT(1, 1)
             continue;
         }