From 24a2bb08abb08e03de8ff962167179cdb4659ed2 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 28 May 2015 12:46:06 -0400
Subject: [PATCH] Fix null dereference on key setup error.

CID 1301369
---
 src/or/routerkeys.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index 7b7a6d02e4..59169cded7 100644
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -199,7 +199,8 @@ ed_key_init_from_file(const char *fname, uint32_t flags,
   goto cleanup;
 
  err:
-  memwipe(keypair, 0, sizeof(*keypair));
+  if (keypair)
+    memwipe(keypair, 0, sizeof(*keypair));
   tor_free(keypair);
   tor_cert_free(cert);
   if (cert_out)