diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-12-15 17:11:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-12-15 17:11:40 -0500 |
| commit | 616cbb31c72a95408d018fd937f1bf3adf886a9f (patch) | |
| tree | a2da4f4c89e108bd182292ea1e8d6b1f6fd6eb7d | |
| parent | 3b896195cb1cd3bded9eb503b33c10bf0eeeaf68 (diff) | |
| parent | 1c87a27574023096212375329e5c4ba1d82f71ce (diff) | |
| download | tor-616cbb31c72a95408d018fd937f1bf3adf886a9f.tar.gz tor-616cbb31c72a95408d018fd937f1bf3adf886a9f.zip | |
Merge commit 'origin/maint-0.2.1'
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/common/crypto.c | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -353,6 +353,8 @@ Changes in Version 0.2.1.21 - 20??-??-?? - Fix a couple of very-hard-to-trigger memory leaks, and one hard-to- trigger platform-specific option misparsing case found by Coverity Scan. + - Fix a compilation warning on Fedora 12 by removing an impossible-to- + trigger assert. Fixes bug 1173. Changes in version 0.2.1.20 - 2009-10-15 diff --git a/src/common/crypto.c b/src/common/crypto.c index e996b48a1a..e7b0ff194f 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -610,7 +610,6 @@ crypto_pk_write_key_to_string_impl(crypto_pk_env_t *env, char **dest, (void)BIO_set_close(b, BIO_NOCLOSE); /* so BIO_free doesn't free buf */ BIO_free(b); - tor_assert(buf->length >= 0); *dest = tor_malloc(buf->length+1); memcpy(*dest, buf->data, buf->length); (*dest)[buf->length] = 0; /* nul terminate it */ |