1 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c
index 66803b5565..96f118c153 100644
--- a/src/lib/libcrypto/dh/dh_lib.c
+++ b/src/lib/libcrypto/dh/dh_lib.c
@@ -168,13 +168,13 @@ DH *DH_new_method(ENGINE *engine)
         ret->method_mont_p=NULL;
         ret->references = 1;
         ret->flags=meth->flags;
+        CRYPTO_new_ex_data(dh_meth,ret,&ret->ex_data);
         if ((meth->init != NULL) && !meth->init(ret))
                 {
+                CRYPTO_free_ex_data(dh_meth,ret,&ret->ex_data);
                 OPENSSL_free(ret);
                 ret=NULL;
                 }
-        else
-                CRYPTO_new_ex_data(dh_meth,ret,&ret->ex_data);
         return(ret);
         }
 
@@ -196,12 +196,12 @@ void DH_free(DH *r)
         }
 #endif
 
-        CRYPTO_free_ex_data(dh_meth, r, &r->ex_data);
-
         meth = ENGINE_get_DH(r->engine);
         if(meth->finish) meth->finish(r);
         ENGINE_finish(r->engine);
 
+        CRYPTO_free_ex_data(dh_meth, r, &r->ex_data);
+
         if (r->p != NULL) BN_clear_free(r->p);
         if (r->g != NULL) BN_clear_free(r->g);
         if (r->q != NULL) BN_clear_free(r->q);