diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
| commit | 5165ed02285315cc0bed7977c7bac6d0a90ca43c (patch) | |
| tree | 9b761a21eb924915e51c2d803208e6c01b505a45 /modules/brotli/dec/bit_reader.c | |
| parent | e1db27e19989db11fef70f439cf95821316535b3 (diff) | |
| parent | ca9abcdf1702c37bf00048dab3f460b2252873a3 (diff) | |
| download | UXP-RC_20201120.tar UXP-RC_20201120.tar.gz UXP-RC_20201120.tar.lz UXP-RC_20201120.tar.xz UXP-RC_20201120.zip | |
Merge branch 'redwood' into releaseRELBASE_20201124RELBASE_20201120RC_20201120
Diffstat (limited to 'modules/brotli/dec/bit_reader.c')
| -rw-r--r-- | modules/brotli/dec/bit_reader.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/modules/brotli/dec/bit_reader.c b/modules/brotli/dec/bit_reader.c index 722fd906d..7f7b256a4 100644 --- a/modules/brotli/dec/bit_reader.c +++ b/modules/brotli/dec/bit_reader.c @@ -15,6 +15,17 @@ extern "C" { #endif +const uint32_t kBrotliBitMask[33] = { 0x00000000, + 0x00000001, 0x00000003, 0x00000007, 0x0000000F, + 0x0000001F, 0x0000003F, 0x0000007F, 0x000000FF, + 0x000001FF, 0x000003FF, 0x000007FF, 0x00000FFF, + 0x00001FFF, 0x00003FFF, 0x00007FFF, 0x0000FFFF, + 0x0001FFFF, 0x0003FFFF, 0x0007FFFF, 0x000FFFFF, + 0x001FFFFF, 0x003FFFFF, 0x007FFFFF, 0x00FFFFFF, + 0x01FFFFFF, 0x03FFFFFF, 0x07FFFFFF, 0x0FFFFFFF, + 0x1FFFFFFF, 0x3FFFFFFF, 0x7FFFFFFF, 0xFFFFFFFF +}; + void BrotliInitBitReader(BrotliBitReader* const br) { br->val_ = 0; br->bit_pos_ = sizeof(br->val_) << 3; @@ -43,6 +54,23 @@ BROTLI_BOOL BrotliWarmupBitReader(BrotliBitReader* const br) { return BROTLI_TRUE; } +BROTLI_BOOL BrotliSafeReadBits32Slow(BrotliBitReader* const br, + uint32_t n_bits, uint32_t* val) { + uint32_t low_val; + uint32_t high_val; + BrotliBitReaderState memento; + BROTLI_DCHECK(n_bits <= 32); + BROTLI_DCHECK(n_bits > 24); + BrotliBitReaderSaveState(br, &memento); + if (!BrotliSafeReadBits(br, 16, &low_val) || + !BrotliSafeReadBits(br, n_bits - 16, &high_val)) { + BrotliBitReaderRestoreState(br, &memento); + return BROTLI_FALSE; + } + *val = low_val | (high_val << 16); + return BROTLI_TRUE; +} + #if defined(__cplusplus) || defined(c_plusplus) } /* extern "C" */ #endif |