summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorKurt Roeckx <kurt@roeckx.be>2014-12-07 22:25:39 +0100
committerKurt Roeckx <kurt@roeckx.be>2014-12-30 16:53:48 +0100
commit5984c7e3d5672198e08d40db978d7eb4868a16eb (patch)
tree4cdf7de47b74cfe52cfa3af1a3addc6c62aa6d08 /apps
parentbeef278bd7a4c3658d2bee5d4f2b5301e42e7a4e (diff)
Fix memory leak in the apps
The BIO_free() allocated ex_data again that we already freed. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r--apps/openssl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/openssl.c b/apps/openssl.c
index 71e1e48ece..5372459456 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -435,9 +435,7 @@ end:
if (prog != NULL) lh_FUNCTION_free(prog);
if (arg.data != NULL) OPENSSL_free(arg.data);
- apps_shutdown();
- CRYPTO_mem_leaks(bio_err);
if (bio_err != NULL)
{
BIO_free(bio_err);
@@ -450,6 +448,9 @@ end:
OPENSSL_free(Argv);
}
#endif
+ apps_shutdown();
+ CRYPTO_mem_leaks(bio_err);
+
OPENSSL_EXIT(ret);
}