[Python-checkins] bpo-35194: cjkcodec: check the encoded value is not truncated (GH-10432)

Fri Mar 29 03:49:13 EDT 2019

https://github.com/python/cpython/commit/5f45979b63300338b68709bfe817ddae563b93fd
commit: 5f45979b63300338b68709bfe817ddae563b93fd
branch: master
author: Alexey Izbyshev <izbyshev at ispras.ru>
committer: Inada Naoki <songofacandy at gmail.com>
date: 2019年03月29日T16:48:47+09:00
summary:
bpo-35194: cjkcodec: check the encoded value is not truncated (GH-10432)
files:
M Modules/cjkcodecs/cjkcodecs.h

diff --git a/Modules/cjkcodecs/cjkcodecs.h b/Modules/cjkcodecs/cjkcodecs.h
index 2ae28ecbe207..b67f3482faf8 100644
--- a/Modules/cjkcodecs/cjkcodecs.h
+++ b/Modules/cjkcodecs/cjkcodecs.h
@@ -149,40 +149,42 @@ static const struct dbcs_map *mapping_list;
 writer->pos += 2; \
 } while (0)
 
-#define OUTBYTE1(c) \
- do { ((*outbuf)[0]) = (c); } while (0)
-#define OUTBYTE2(c) \
- do { ((*outbuf)[1]) = (c); } while (0)
-#define OUTBYTE3(c) \
- do { ((*outbuf)[2]) = (c); } while (0)
-#define OUTBYTE4(c) \
- do { ((*outbuf)[3]) = (c); } while (0)
+#define OUTBYTEI(c, i) \
+ do { \
+ assert((unsigned char)(c) == (c)); \
+ ((*outbuf)[i]) = (c); \
+ } while (0)
+
+#define OUTBYTE1(c) OUTBYTEI(c, 0)
+#define OUTBYTE2(c) OUTBYTEI(c, 1)
+#define OUTBYTE3(c) OUTBYTEI(c, 2)
+#define OUTBYTE4(c) OUTBYTEI(c, 3)
 
 #define WRITEBYTE1(c1) \
 do { \
 REQUIRE_OUTBUF(1); \
- (*outbuf)[0] = (c1); \
+ OUTBYTE1(c1); \
 } while (0)
 #define WRITEBYTE2(c1, c2) \
 do { \
 REQUIRE_OUTBUF(2); \
- (*outbuf)[0] = (c1); \
- (*outbuf)[1] = (c2); \
+ OUTBYTE1(c1); \
+ OUTBYTE2(c2); \
 } while (0)
 #define WRITEBYTE3(c1, c2, c3) \
 do { \
 REQUIRE_OUTBUF(3); \
- (*outbuf)[0] = (c1); \
- (*outbuf)[1] = (c2); \
- (*outbuf)[2] = (c3); \
+ OUTBYTE1(c1); \
+ OUTBYTE2(c2); \
+ OUTBYTE3(c3); \
 } while (0)
 #define WRITEBYTE4(c1, c2, c3, c4) \
 do { \
 REQUIRE_OUTBUF(4); \
- (*outbuf)[0] = (c1); \
- (*outbuf)[1] = (c2); \
- (*outbuf)[2] = (c3); \
- (*outbuf)[3] = (c4); \
+ OUTBYTE1(c1); \
+ OUTBYTE2(c2); \
+ OUTBYTE3(c3); \
+ OUTBYTE4(c4); \
 } while (0)
 
 #define _TRYMAP_ENC(m, assi, val) \
