From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 5 Sep 2008 20:18:22 +0000 (+0000)
Subject: Clean up some redundant stuff in crypto_dh_new().
X-Git-Tag: tor-0.2.1.6-alpha~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d94e061c7a1af2fbb92ab3114c3ce5f59971a31;p=thirdparty%2Ftor.git

Clean up some redundant stuff in crypto_dh_new().

svn:r16778
---

diff --git a/src/common/crypto.c b/src/common/crypto.c
index b158967a35..e1b4012138 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -1465,13 +1465,11 @@ init_dh_param(void)
 crypto_dh_env_t *
 crypto_dh_new(void)
 {
-  crypto_dh_env_t *res = NULL;
+  crypto_dh_env_t *res = tor_malloc_zero(sizeof(crypto_dh_env_t));
 
   if (!dh_param_p)
     init_dh_param();
 
-  res = tor_malloc_zero(sizeof(crypto_dh_env_t));
-
   if (!(res->dh = DH_new()))
     goto err;
 
@@ -1486,8 +1484,8 @@ crypto_dh_new(void)
   return res;
  err:
   crypto_log_errors(LOG_WARN, "creating DH object");
-  if (res && res->dh) DH_free(res->dh); /* frees p and g too */
-  if (res) tor_free(res);
+  if (res->dh) DH_free(res->dh); /* frees p and g too */
+  tor_free(res);
   return NULL;
 }