summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-10-21 08:17:34 -0400
committerNick Mathewson <nickm@torproject.org>2015-10-21 08:17:34 -0400
commit2461ea1faa20fc435bdf786147afe99207366c29 (patch)
tree0bbb7fce2fed9305c47a45f50b3b50d5879f4e51
parentd478704de889dfc41a72af1187dc52e465ea0cdc (diff)
parent542cc8a5fff7b566cb44185e1fb6aae8ff469a16 (diff)
downloadtor-2461ea1faa20fc435bdf786147afe99207366c29.tar.gz
tor-2461ea1faa20fc435bdf786147afe99207366c29.zip
Merge remote-tracking branch 'origin/maint-0.2.7'
-rw-r--r--changes/bug173983
-rw-r--r--src/common/crypto_ed25519.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug17398 b/changes/bug17398
new file mode 100644
index 0000000000..66e27a6966
--- /dev/null
+++ b/changes/bug17398
@@ -0,0 +1,3 @@
+ o Minor bugfixes (memory leaks):
+ - Fix a memory leak in ed25519 batch signature checking.
+ Fixes bug 17398; bugfix on 0.2.6.1-alpha.
diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c
index 7e995f4616..1749efc34c 100644
--- a/src/common/crypto_ed25519.c
+++ b/src/common/crypto_ed25519.c
@@ -260,6 +260,7 @@ ed25519_checksig_batch(int *okay_out,
tor_free(ms);
tor_free(lens);
tor_free(pks);
+ tor_free(sigs);
if (! okay_out)
tor_free(oks);
}