diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-03 15:41:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-03 15:41:04 -0400 |
| commit | 3bb49c011006d042f8a3f802d7abb3e9da51b15b (patch) | |
| tree | a4114853839d822abacbbdae6085d2fdd4eb225c /src/common | |
| parent | ff3e08f2af226d9660a08ab599c7e446c42fd7b4 (diff) | |
| parent | 9b18b215bb34c4df1b94dec218c68a532c341e26 (diff) | |
| download | tor-3bb49c011006d042f8a3f802d7abb3e9da51b15b.tar.gz tor-3bb49c011006d042f8a3f802d7abb3e9da51b15b.zip | |
Merge branch 'maint-0.2.8' into maint-0.2.9
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/crypto.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index 56409b47e2..fff516cc8e 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -743,14 +743,13 @@ crypto_pk_write_key_to_string_impl(crypto_pk_t *env, char **dest, } BIO_get_mem_ptr(b, &buf); - (void)BIO_set_close(b, BIO_NOCLOSE); /* so BIO_free doesn't free buf */ - BIO_free(b); *dest = tor_malloc(buf->length+1); memcpy(*dest, buf->data, buf->length); (*dest)[buf->length] = 0; /* nul terminate it */ *len = buf->length; - BUF_MEM_free(buf); + + BIO_free(b); return 0; } |