emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace int -> uint to avoid signed integer overflow

Browse Source 
An example of such an error (should be compiled with DEBUG_SANITIZE):

runtime error: left shift of 1 by 31 places cannot be represented in
type 'int'

Signed-off-by: Rostislav Skudnov <rostislav@tuxera.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Rostislav Skudnov 2017-02-01 18:35:13 +00:00 committed by Denys Vlasenko
parent c31b54fd81
commit 8762512fdb
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archival/libarchive/decompress_bunzip2.c
View File

@ -134,7 +134,7 @@ static unsigned get_bits(bunzip_data *bd, int bits_wanted)
/* Avoid 32-bit overflow (dump bit buffer to top of output) */ /* Avoid 32-bit overflow (dump bit buffer to top of output) */
if (bit_count >= 24) { if (bit_count >= 24) {
bits = bd->inbufBits & ((1 << bit_count) - 1); bits = bd->inbufBits & ((1U << bit_count) - 1);
bits_wanted -= bit_count; bits_wanted -= bit_count;
bits <<= bits_wanted; bits <<= bits_wanted;
bit_count = 0; bit_count = 0;
@ -158,11 +158,11 @@ static int get_next_block(bunzip_data *bd)
{ {
struct group_data *hufGroup; struct group_data *hufGroup;
int dbufCount, dbufSize, groupCount, *base, *limit, selector, int dbufCount, dbufSize, groupCount, *base, *limit, selector,
i, j, t, runPos, symCount, symTotal, nSelectors, byteCount[256]; i, j, runPos, symCount, symTotal, nSelectors, byteCount[256];
int runCnt = runCnt; /* for compiler */ int runCnt = runCnt; /* for compiler */
uint8_t uc, symToByte[256], mtfSymbol[256], *selectors; uint8_t uc, symToByte[256], mtfSymbol[256], *selectors;
uint32_t *dbuf; uint32_t *dbuf;
unsigned origPtr; unsigned origPtr, t;
dbuf = bd->dbuf; dbuf = bd->dbuf;
dbufSize = bd->dbufSize; dbufSize = bd->dbufSize;

2
libbb/crc32.c
View File

@ -24,7 +24,7 @@ uint32_t* FAST_FUNC crc32_filltable(uint32_t *crc_table, int endian)
{ {
uint32_t polynomial = endian ? 0x04c11db7 : 0xedb88320; uint32_t polynomial = endian ? 0x04c11db7 : 0xedb88320;
uint32_t c; uint32_t c;
int i, j; unsigned i, j;
if (!crc_table) if (!crc_table)
crc_table = xmalloc(256 * sizeof(uint32_t)); crc_table = xmalloc(256 * sizeof(uint32_t));

4
libbb/getopt32.c
View File

@ -404,7 +404,7 @@ getopt32(char **argv, const char *applet_opts, ...)
if (c >= 32) if (c >= 32)
break; break;
on_off->opt_char = *s; on_off->opt_char = *s;
on_off->switch_on = (1 << c); on_off->switch_on = (1U << c);
if (*++s == ':') { if (*++s == ':') {
on_off->optarg = va_arg(p, void **); on_off->optarg = va_arg(p, void **);
if (s[1] == '+' || s[1] == '*') { if (s[1] == '+' || s[1] == '*') {
@ -454,7 +454,7 @@ getopt32(char **argv, const char *applet_opts, ...)
if (c >= 32) if (c >= 32)
break; break;
on_off->opt_char = l_o->val; on_off->opt_char = l_o->val;
on_off->switch_on = (1 << c); on_off->switch_on = (1U << c);
if (l_o->has_arg != no_argument) if (l_o->has_arg != no_argument)
on_off->optarg = va_arg(p, void **); on_off->optarg = va_arg(p, void **);
c++; c++;

2
libbb/pw_encrypt.c
View File

@ -30,7 +30,7 @@ static int i64c(int i)
int FAST_FUNC crypt_make_salt(char *p, int cnt /*, int x */) int FAST_FUNC crypt_make_salt(char *p, int cnt /*, int x */)
{ {
/* was: x += ... */ /* was: x += ... */
int x = getpid() + monotonic_us(); unsigned x = getpid() + monotonic_us();
do { do {
/* x = (x*1664525 + 1013904223) % 2^32 generator is lame /* x = (x*1664525 + 1013904223) % 2^32 generator is lame
* (low-order bit is not "random", etc...), * (low-order bit is not "random", etc...),

2
miscutils/rx.c
View File

@ -94,7 +94,7 @@ static int receive(/*int read_fd, */int file_fd)
int blockBegin; int blockBegin;
int blockNo, blockNoOnesCompl; int blockNo, blockNoOnesCompl;
int cksum_or_crc; int cksum_or_crc;
int expected; unsigned expected;
int i, j; int i, j;
blockBegin = read_byte(timeout); blockBegin = read_byte(timeout);