nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.9' into maint-0.3.0

Browse Source
This commit is contained in:
Nick Mathewson 2017-09-12 09:23:57 -04:00
commit 0729ba2868
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/torgzip.c
View File

@ -181,6 +181,7 @@ tor_gzip_compress(char **out, size_t *out_len,
/* In case zlib doesn't work as I think .... */ /* In case zlib doesn't work as I think .... */
if (stream->avail_out >= stream->avail_in+16) if (stream->avail_out >= stream->avail_in+16)
break; break;
/* Falls through. */
case Z_BUF_ERROR: case Z_BUF_ERROR:
offset = stream->next_out - ((unsigned char*)*out); offset = stream->next_out - ((unsigned char*)*out);
old_size = out_size; old_size = out_size;
@ -319,6 +320,7 @@ tor_gzip_uncompress(char **out, size_t *out_len,
/* In case zlib doesn't work as I think.... */ /* In case zlib doesn't work as I think.... */
if (stream->avail_out >= stream->avail_in+16) if (stream->avail_out >= stream->avail_in+16)
break; break;
/* Falls through. */
case Z_BUF_ERROR: case Z_BUF_ERROR:
if (stream->avail_out > 0) { if (stream->avail_out > 0) {
log_fn(protocol_warn_level, LD_PROTOCOL, log_fn(protocol_warn_level, LD_PROTOCOL,