[or-cvs] r16778: {tor} Clean up some redundant stuff in crypto_dh_new(). (tor/trunk/src/common)

[nickm at seul.org]

Author: nickm
Date: 2008-09-05 16:18:22 -0400 (Fri, 05 Sep 2008)
New Revision: 16778

Modified:
   tor/trunk/src/common/crypto.c
Log:
Clean up some redundant stuff in crypto_dh_new().

Modified: tor/trunk/src/common/crypto.c
===================================================================
--- tor/trunk/src/common/crypto.c	2008-09-05 20:04:27 UTC (rev 16777)
+++ tor/trunk/src/common/crypto.c	2008-09-05 20:18:22 UTC (rev 16778)
@@ -1465,13 +1465,11 @@
 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 @@
   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;
 }