Commit 15e5cf60 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Fix memory leak when uncompressing concatenated zlib streams. Unit tests and... 

Fix memory leak when uncompressing concatenated zlib streams. Unit tests and tor client work; looks ok.


svn:r6211
parent 68b3b3ee

src/common/torgzip.c

+4 −3
Original line number Diff line number Diff line
@@ -205,9 +205,10 @@ tor_gzip_uncompress(char **out, size_t *out_len, 
        if (stream->avail_in == 0)

          goto done;

        /* There may be more compressed data here. */

        /* XXX But if so, this is not the right way to find it. If

         * we call inflateInit2 below, stream->state will get

         * re-zcalloc'ed and we'll leak the old one. -RD */

        if ((r = inflateEnd(stream)) != Z_OK) {

          log_warn(LD_GENERAL, "Error freeing gzip structures");

          goto err;

        }

        if (inflateInit2(stream, method_bits(method)) != Z_OK) {

          log_warn(LD_GENERAL, "Error from inflateInit2: %s",

                   stream->msg?stream->msg:"<no message>");