nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix integer overflows in the conversion tables

Browse Source
This commit is contained in:
cypherpunks 2016-05-25 11:17:29 +00:00 committed by Nick Mathewson
parent 06e82084d6
commit 8d67c079b4
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug19168 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (code correctness):
- Fix integer overflows in the case conversion tables. Fixes bug
19168; bugfix on 0.2.1.11-alpha.

4
src/common/compat.c
View File

@ -645,7 +645,7 @@ const uint32_t TOR_ISLOWER_TABLE[8] = { 0, 0, 0, 0x7fffffe, 0, 0, 0, 0 };
/** Upper-casing and lowercasing tables to map characters to upper/lowercase /** Upper-casing and lowercasing tables to map characters to upper/lowercase
* equivalents. Used by tor_toupper() and tor_tolower(). */ * equivalents. Used by tor_toupper() and tor_tolower(). */
/**@{*/ /**@{*/
const char TOR_TOUPPER_TABLE[256] = { const uint8_t TOR_TOUPPER_TABLE[256] = {
0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,
16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,
32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, 32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,
@ -663,7 +663,7 @@ const char TOR_TOUPPER_TABLE[256] = {
224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239, 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255, 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,
}; };
const char TOR_TOLOWER_TABLE[256] = { const uint8_t TOR_TOLOWER_TABLE[256] = {
0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,
16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,
32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, 32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,

4
src/common/compat.h
View File

@ -360,8 +360,8 @@ DECLARE_CTYPE_FN(ISXDIGIT)
DECLARE_CTYPE_FN(ISPRINT) DECLARE_CTYPE_FN(ISPRINT)
DECLARE_CTYPE_FN(ISLOWER) DECLARE_CTYPE_FN(ISLOWER)
DECLARE_CTYPE_FN(ISUPPER) DECLARE_CTYPE_FN(ISUPPER)
extern const char TOR_TOUPPER_TABLE[]; extern const uint8_t TOR_TOUPPER_TABLE[];
extern const char TOR_TOLOWER_TABLE[]; extern const uint8_t TOR_TOLOWER_TABLE[];
#define TOR_TOLOWER(c) (TOR_TOLOWER_TABLE[(uint8_t)c]) #define TOR_TOLOWER(c) (TOR_TOLOWER_TABLE[(uint8_t)c])
#define TOR_TOUPPER(c) (TOR_TOUPPER_TABLE[(uint8_t)c]) #define TOR_TOUPPER(c) (TOR_TOUPPER_TABLE[(uint8_t)c])