diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-01-16 05:27:19 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-01-16 05:27:19 +0000 |
| commit | 4a3b7496f0c47b0d00c9744698eaa237e601b32a (patch) | |
| tree | fdefeb3c864306cc52f3e9f5dadb8414f8a99187 /src/common | |
| parent | 24aae484c93b09c7fc735e53874f02a22e4b5b43 (diff) | |
| download | tor-4a3b7496f0c47b0d00c9744698eaa237e601b32a.tar.gz tor-4a3b7496f0c47b0d00c9744698eaa237e601b32a.zip | |
r17639@catbus: nickm | 2008-01-15 19:09:21 -0500
Fix some hard to trigger but nonetheless real memory leaks spotted by an anonymous contributor. Needs review. Partial backport candidate.
svn:r13147
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/torgzip.c | 2 | ||||
| -rw-r--r-- | src/common/tortls.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 1fc301260c..09e22bd2d4 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -139,7 +139,7 @@ tor_gzip_compress(char **out, size_t *out_len, *out_len = stream->total_out; if (stream->total_out > out_size + 4097) { /* If we're wasting more than 4k, don't. */ - tor_realloc(*out, stream->total_out + 1); + *out = tor_realloc(*out, stream->total_out + 1); } if (deflateEnd(stream)!=Z_OK) { log_warn(LD_BUG, "Error freeing gzip structures"); diff --git a/src/common/tortls.c b/src/common/tortls.c index 68e9baf33c..8c31633895 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -43,7 +43,7 @@ const char tortls_c_id[] = #include <string.h> // #define V2_HANDSHAKE_SERVER -// #define V2_HANDSHAKE_CLIENT +#define V2_HANDSHAKE_CLIENT /* Copied from or.h */ #define LEGAL_NICKNAME_CHARACTERS \ |