diff options
author | Rostislav Skudnov <rostislav@tuxera.com> | 2017-02-01 18:35:13 +0000 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-02-04 23:10:22 +0100 |
commit | 8762512fdb088acefb9f3ea5f7b1e1bf2d336ff3 (patch) | |
tree | 309e04746b4bcb6f2ad645b29f7fcecfbff339e5 /libbb | |
parent | c31b54fd81690b3df3898437f5865674d06e6577 (diff) | |
download | busybox-w32-8762512fdb088acefb9f3ea5f7b1e1bf2d336ff3.tar.gz busybox-w32-8762512fdb088acefb9f3ea5f7b1e1bf2d336ff3.tar.bz2 busybox-w32-8762512fdb088acefb9f3ea5f7b1e1bf2d336ff3.zip |
Replace int -> uint to avoid signed integer overflow
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>
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/crc32.c | 2 | ||||
-rw-r--r-- | libbb/getopt32.c | 4 | ||||
-rw-r--r-- | libbb/pw_encrypt.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libbb/crc32.c b/libbb/crc32.c index ac9836cc9..0711ca84e 100644 --- a/libbb/crc32.c +++ b/libbb/crc32.c | |||
@@ -24,7 +24,7 @@ uint32_t* FAST_FUNC crc32_filltable(uint32_t *crc_table, int endian) | |||
24 | { | 24 | { |
25 | uint32_t polynomial = endian ? 0x04c11db7 : 0xedb88320; | 25 | uint32_t polynomial = endian ? 0x04c11db7 : 0xedb88320; |
26 | uint32_t c; | 26 | uint32_t c; |
27 | int i, j; | 27 | unsigned i, j; |
28 | 28 | ||
29 | if (!crc_table) | 29 | if (!crc_table) |
30 | crc_table = xmalloc(256 * sizeof(uint32_t)); | 30 | crc_table = xmalloc(256 * sizeof(uint32_t)); |
diff --git a/libbb/getopt32.c b/libbb/getopt32.c index 15b6efc09..497fc016f 100644 --- a/libbb/getopt32.c +++ b/libbb/getopt32.c | |||
@@ -404,7 +404,7 @@ getopt32(char **argv, const char *applet_opts, ...) | |||
404 | if (c >= 32) | 404 | if (c >= 32) |
405 | break; | 405 | break; |
406 | on_off->opt_char = *s; | 406 | on_off->opt_char = *s; |
407 | on_off->switch_on = (1 << c); | 407 | on_off->switch_on = (1U << c); |
408 | if (*++s == ':') { | 408 | if (*++s == ':') { |
409 | on_off->optarg = va_arg(p, void **); | 409 | on_off->optarg = va_arg(p, void **); |
410 | if (s[1] == '+' || s[1] == '*') { | 410 | if (s[1] == '+' || s[1] == '*') { |
@@ -454,7 +454,7 @@ getopt32(char **argv, const char *applet_opts, ...) | |||
454 | if (c >= 32) | 454 | if (c >= 32) |
455 | break; | 455 | break; |
456 | on_off->opt_char = l_o->val; | 456 | on_off->opt_char = l_o->val; |
457 | on_off->switch_on = (1 << c); | 457 | on_off->switch_on = (1U << c); |
458 | if (l_o->has_arg != no_argument) | 458 | if (l_o->has_arg != no_argument) |
459 | on_off->optarg = va_arg(p, void **); | 459 | on_off->optarg = va_arg(p, void **); |
460 | c++; | 460 | c++; |
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c index 4cdc2de76..fe06a8fe6 100644 --- a/libbb/pw_encrypt.c +++ b/libbb/pw_encrypt.c | |||
@@ -30,7 +30,7 @@ static int i64c(int i) | |||
30 | int FAST_FUNC crypt_make_salt(char *p, int cnt /*, int x */) | 30 | int FAST_FUNC crypt_make_salt(char *p, int cnt /*, int x */) |
31 | { | 31 | { |
32 | /* was: x += ... */ | 32 | /* was: x += ... */ |
33 | int x = getpid() + monotonic_us(); | 33 | unsigned x = getpid() + monotonic_us(); |
34 | do { | 34 | do { |
35 | /* x = (x*1664525 + 1013904223) % 2^32 generator is lame | 35 | /* x = (x*1664525 + 1013904223) % 2^32 generator is lame |
36 | * (low-order bit is not "random", etc...), | 36 | * (low-order bit is not "random", etc...), |