[or-cvs] ok, commenting that out broke things real bad.

arma at seul.org arma at seul.org
Mon Mar 20 02:13:38 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:
ok, commenting that out broke things real bad.
leave it, and accept the memory leak for now.


Index: torgzip.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/common/torgzip.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -d -r1.30 -r1.31
--- torgzip.c	20 Mar 2006 00:52:22 -0000	1.30
+++ torgzip.c	20 Mar 2006 02:13:35 -0000	1.31
@@ -204,9 +204,8 @@ 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
+        /* 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 (inflateInit2(stream, method_bits(method)) != Z_OK) {
@@ -214,7 +213,6 @@ tor_gzip_uncompress(char **out, size_t *
                    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