From: Ismo Puustinen <ismo.puustinen@intel.com>
Date: Sat, 8 Aug 2015 02:11:28 +0000 (-0400)
Subject: GH364: Free memory on an error path
X-Git-Tag: OpenSSL_1_0_2e~136
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=25efcb44ac88ab34f60047e16a96c9462fad39c1;p=oweals%2Fopenssl.git

GH364: Free memory on an error path

Part of RT 3997
Per Ben, just jump to common exit code.

Signed-off-by: Rich Salz <rsalz@akamai.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit cc2829e6641092abed8360433dbe67e883fd1cc6)
---

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index a2f1dbefe3..26c6bb3b11 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -354,7 +354,8 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
             if (!sk_X509_push(ctx->chain, x)) {
                 X509_free(xtmp);
                 X509err(X509_F_X509_VERIFY_CERT, ERR_R_MALLOC_FAILURE);
-                return 0;
+                ok = 0;
+                goto done;
             }
             num++;
         }