rshen/c-capnproto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'kylemanna' into merge

Browse source 
Conflicts: (manually resolved)
	capn-malloc.c
	capn-stream.c
	capn-test.cpp
	capn.c
	capn.h
	compiler/capnpc-c.c
This commit is contained in:
David Lamparter 2016-02-28 12:32:59 +01:00
commit 02268ff818
5 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
capn-stream.c
View file

@ -80,7 +80,7 @@ int capn_deflate(struct capn_stream* s) {
continue;
default:
if (s->avail_out < 1 + sz)
if (s->avail_out < 1U + sz)
return CAPN_NEED_MORE;
*(s->next_out++) = hdr;
@ -167,7 +167,7 @@ int capn_inflate(struct capn_stream* s) {
if (hdr & (1 << i))
sz++;
}
if (s->avail_in < 1 + sz)
if (s->avail_in < 1U + sz)
return CAPN_NEED_MORE;
s->next_in += 1;