[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Rich Salz]

The branch OpenSSL_1_0_2-stable has been updated
       via  25efcb44ac88ab34f60047e16a96c9462fad39c1 (commit)
      from  5859bc62f3dc79aea2844f0349cfa9dcbd570dfb (commit)


- Log -----------------------------------------------------------------
commit 25efcb44ac88ab34f60047e16a96c9462fad39c1
Author: Ismo Puustinen <ismo.puustinen at intel.com>
Date:   Fri Aug 7 22:11:28 2015 -0400

    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 at akamai.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit cc2829e6641092abed8360433dbe67e883fd1cc6)

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509/x509_vfy.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index a2f1dbe..26c6bb3 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++;
         }