[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  cc2829e6641092abed8360433dbe67e883fd1cc6 (commit)
      from  df758a8569efe9e124baaa16aba4ac3fc35bbd9d (commit)


- Log -----------------------------------------------------------------
commit cc2829e6641092abed8360433dbe67e883fd1cc6
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>

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

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 26867cb..6b1f7fe 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -348,7 +348,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++;
         }