nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/maint-0.2.1'

Browse Source
This commit is contained in:
Nick Mathewson 2009-12-15 17:11:40 -05:00
commit 616cbb31c7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -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- - Fix a couple of very-hard-to-trigger memory leaks, and one hard-to-
trigger platform-specific option misparsing case found by Coverity trigger platform-specific option misparsing case found by Coverity
Scan. 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 Changes in version 0.2.1.20 - 2009-10-15

1
src/common/crypto.c
View File

@ -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 */ (void)BIO_set_close(b, BIO_NOCLOSE); /* so BIO_free doesn't free buf */
BIO_free(b); BIO_free(b);
tor_assert(buf->length >= 0);
*dest = tor_malloc(buf->length+1); *dest = tor_malloc(buf->length+1);
memcpy(*dest, buf->data, buf->length); memcpy(*dest, buf->data, buf->length);
(*dest)[buf->length] = 0; /* nul terminate it */ (*dest)[buf->length] = 0; /* nul terminate it */