33e955ab9
Denys Vlasenko
2020-11-30
Subject
unicode: fix handling of short 1-4 char tables
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/time.c+0 -1
| @@ -250,7 +250,6 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp) | |
| #if ENABLE_MONOTONIC_SYSCALL | |
| - | #include <sys/syscall.h> |
| /* Old glibc (< 2.3.4) does not provide this constant. We use syscall | |
| * directly so this definition is safe. */ | |
| #ifndef CLOCK_MONOTONIC | |
libbb/unicode.c+4 -2
| @@ -306,8 +306,10 @@ static int in_uint16_table(unsigned ucs, const uint16_t *table, unsigned max) | |
| unsigned first, last; | |
| first = table[0] >> 2; | |
| - | last = first + (table[0] & 3); |
| - | if (ucs < first || ucs > last) |
| + | if (ucs < first) |
| + | return 0; |
| + | last = (table[max] >> 2) + (table[max] & 3); |
| + | if (ucs > last) |
| return 0; | |
| min = 0; | |