AuroraMiddleware/brotli
1
0
Fork 0
mirror of https://github.com/google/brotli.git synced 2024-11-22 03:30:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25 from irori/sign-compare

Browse Source 
Make decoder code warning-free
This commit is contained in:
szabadka 2015-02-24 10:41:41 +01:00
commit 35cd3db9c1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dec/Makefile
View File

@ -2,6 +2,8 @@
include ../shared.mk
CPPFLAGS += -Wall
OBJS = bit_reader.o decode.o huffman.o safe_malloc.o streams.o
all : $(OBJS)

4
dec/decode.c
View File

@ -646,7 +646,7 @@ int BrotliDecompressedSize(size_t encoded_size,
}
/* Look at the first 8 bytes, it is enough to decode the length of the first
meta-block. */
for (i = 0; i < encoded_size && i < 8; ++i) {
for (i = 0; (size_t)i < encoded_size && i < 8; ++i) {
val |= (uint64_t)encoded_buffer[i] << (8 * i);
}
/* Skip the window bits. */
@ -683,7 +683,7 @@ int BrotliDecompressedSize(size_t encoded_size,
both are set to 1, we have a stream with an uncompressed meta-block
followed by an empty one, so the decompressed size is the size of the
first meta-block. */
int offset = ((bit_pos + 7) >> 3) + meta_block_len;
size_t offset = ((bit_pos + 7) >> 3) + meta_block_len;
if (offset < encoded_size && ((encoded_buffer[offset] & 3) == 3)) {
*decoded_size = (size_t)meta_block_len;
return 1;