From e7bf281be16331b66002b66cd2eebf7130ed5bb9 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Tue, 19 Aug 2014 11:36:45 -0700 Subject: [PATCH] Fix (harmless) memory leak in the test harness. Change-Id: Ia0daaaaf464cfa0e9d563d7f376ce2bb2e338685 Reviewed-on: https://boringssl-review.googlesource.com/1560 Reviewed-by: David Benjamin Reviewed-by: Adam Langley --- ssl/test/bssl_shim.cc | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc index bc4a186eb..c976e7c28 100644 --- a/ssl/test/bssl_shim.cc +++ b/ssl/test/bssl_shim.cc @@ -482,27 +482,30 @@ int main(int argc, char **argv) { return 1; } - SSL_SESSION *session; + SSL_SESSION *session = NULL; int ret = do_exchange(&session, ssl_ctx, &config, false /* is_resume */, 3 /* fd */, NULL /* session */); if (ret != 0) { - return ret; + goto out; } if (config.resume) { - int ret = do_exchange(NULL, - ssl_ctx, &config, - true /* is_resume */, - 4 /* fd */, - config.is_server ? NULL : session); + ret = do_exchange(NULL, + ssl_ctx, &config, + true /* is_resume */, + 4 /* fd */, + config.is_server ? NULL : session); if (ret != 0) { - return ret; + goto out; } } + ret = 0; + +out: SSL_SESSION_free(session); SSL_CTX_free(ssl_ctx); - return 0; + return ret; }