From: Jonas Maebe <jonas.maebe@elis.ugent.be>
Date: Mon, 9 Dec 2013 16:02:44 +0000 (+0100)
Subject: SSL_set_session: check for NULL after allocating s->kssl_ctx->client_princ
X-Git-Tag: master-pre-reformat~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fed5b5525204a6892c936173d9336c479fa83941;p=thirdparty%2Fopenssl.git

SSL_set_session: check for NULL after allocating s->kssl_ctx->client_princ

Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 3bac2dbc693..a85f2792ce2 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -792,6 +792,11 @@ int SSL_set_session(SSL *s, SSL_SESSION *session)
                     session->krb5_client_princ_len > 0)
                 {
                     s->kssl_ctx->client_princ = (char *)OPENSSL_malloc(session->krb5_client_princ_len + 1);
+                    if (s->kssl_ctx->client_princ == NULL)
+                    {
+                        SSLerr(SSL_F_SSL_SET_SESSION, ERR_R_MALLOC_FAILURE);
+                        return(0);
+                    }
                     memcpy(s->kssl_ctx->client_princ,session->krb5_client_princ,
                             session->krb5_client_princ_len);
                     s->kssl_ctx->client_princ[session->krb5_client_princ_len] = '\0';