[or-cvs] Resolve a memory leak on clients. This disables some

arma at seul.org arma at seul.org
Mon Mar 20 00:52:24 UTC 2006


Update of /home2/or/cvsroot/tor/src/common
In directory moria:/home/arma/work/onion/cvs/tor/src/common

Modified Files:
	torgzip.c 
Log Message:
Resolve a memory leak on clients. This disables some
functionality that we might still want. Nick?


Index: torgzip.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/common/torgzip.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -d -r1.29 -r1.30
--- torgzip.c	13 Feb 2006 08:01:59 -0000	1.29
+++ torgzip.c	20 Mar 2006 00:52:22 -0000	1.30
@@ -204,12 +204,17 @@ tor_gzip_uncompress(char **out, size_t *
       case Z_STREAM_END:
         if (stream->avail_in == 0)
           goto done;
+#if 0
         /* There may be more compressed data here. */
+        /* 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 (inflateInit2(stream, method_bits(method)) != Z_OK) {
           log_warn(LD_GENERAL, "Error from inflateInit2: %s",
                    stream->msg?stream->msg:"<no message>");
           goto err;
         }
+#endif
         break;
       case Z_OK:
         if (!complete_only && stream->avail_in == 0)



More information about the tor-commits mailing list