Fix two possible leaks.

Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
GH: #580

diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index cc29ca4e4d93bde1b4c22dfc8b3d302a10e36112..dfa738aa0a7e812a168a4bcc9eea299fc41ee4a4 100644 (file)
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -122,6 +122,7 @@ DSO *DSO_new_method(DSO_METHOD *meth)
         ret->meth = meth;
     ret->references = 1;
     if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {
         ret->meth = meth;
     ret->references = 1;
     if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {

+        sk_void_free(ret->meth_data);

         OPENSSL_free(ret);
         ret = NULL;
     }
         OPENSSL_free(ret);
         ret = NULL;
     }

diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c
index d19cab2ecf84d442bd2b8f6515d81ef2f00c315b..bdd0a1aeb6d0b351a489900de28d105b023b4696 100644 (file)
--- a/crypto/engine/eng_dyn.c
+++ b/crypto/engine/eng_dyn.c
@@ -231,6 +231,8 @@ static int dynamic_set_data_ctx(ENGINE *e, dynamic_data_ctx **ctx)
      * If we lost the race to set the context, c is non-NULL and *ctx is the
      * context of the thread that won.
      */
      * If we lost the race to set the context, c is non-NULL and *ctx is the
      * context of the thread that won.
      */

+    if (c)
+        sk_OPENSSL_STRING_free(c->dirs);

     OPENSSL_free(c);
     return 1;
 }
     OPENSSL_free(c);
     return 1;
 }