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

r17613@catbus: nickm | 2008-01-14 13:52:44 -0500

Browse Source 
Do not segfault if symetric key generation somehow fails in crypto_hybrid_encrypt.


svn:r13132
This commit is contained in:
Nick Mathewson 2008-01-14 19:00:28 +00:00
parent 581ba51c5c
commit d7fb8a34ac
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -45,6 +45,8 @@ Changes in version 0.2.0.16-alpha - 2008-01-??
- Make bridges round geoip info up, not down.
- Avoid a spurious free on base64 failure. Bugfix on 0.1.2.
- Detect more kinds of possible internal error.
- Avoid possible segfault if key generation fails in
crypto_pk_hybrid_encrypt. Bugfix on 0.2.0.
o Minor features (controller):
- Get NS events working again. (Patch from tup)

6
src/common/crypto.c
View File

@ -858,8 +858,10 @@ crypto_pk_public_hybrid_encrypt(crypto_pk_env_t *env,
crypto_free_cipher_env(cipher);
return outlen + symlen;
err:
memset(buf, 0, pkeylen);
tor_free(buf);
if (buf) {
memset(buf, 0, pkeylen);
tor_free(buf);
}
if (cipher) crypto_free_cipher_env(cipher);
return -1;
}