Commit 72e9be3d authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

GH235: Set error status on malloc failure 



Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
parent b5292f7b

include/openssl/ssl.h

+2 −0
Original line number Diff line number Diff line
@@ -2044,6 +2044,7 @@ void ERR_load_SSL_strings(void); 
# define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY                  168

# define SSL_F_SSL_CTX_MAKE_PROFILES                      309

# define SSL_F_SSL_CTX_NEW                                169

# define SSL_F_SSL_CTX_SET_ALPN_PROTOS                    343

# define SSL_F_SSL_CTX_SET_CIPHER_LIST                    269

# define SSL_F_SSL_CTX_SET_CLIENT_CERT_ENGINE             290

# define SSL_F_SSL_CTX_SET_PURPOSE                        226
@@ -2091,6 +2092,7 @@ void ERR_load_SSL_strings(void); 
# define SSL_F_SSL_SESSION_NEW                            189

# define SSL_F_SSL_SESSION_PRINT_FP                       190

# define SSL_F_SSL_SESSION_SET1_ID_CONTEXT                312

# define SSL_F_SSL_SET_ALPN_PROTOS                        344

# define SSL_F_SSL_SET_CERT                               191

# define SSL_F_SSL_SET_CIPHER_LIST                        271

# define SSL_F_SSL_SET_FD                                 192

ssl/ssl_err.c

+2 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_SSL_CTX_CHECK_PRIVATE_KEY), "SSL_CTX_check_private_key"},

    {ERR_FUNC(SSL_F_SSL_CTX_MAKE_PROFILES), "ssl_ctx_make_profiles"},

    {ERR_FUNC(SSL_F_SSL_CTX_NEW), "SSL_CTX_new"},

    {ERR_FUNC(SSL_F_SSL_CTX_SET_ALPN_PROTOS), "SSL_CTX_set_alpn_protos"},

    {ERR_FUNC(SSL_F_SSL_CTX_SET_CIPHER_LIST), "SSL_CTX_set_cipher_list"},

    {ERR_FUNC(SSL_F_SSL_CTX_SET_CLIENT_CERT_ENGINE),

     "SSL_CTX_set_client_cert_engine"},
@@ -239,6 +240,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_SSL_SESSION_PRINT_FP), "SSL_SESSION_print_fp"},

    {ERR_FUNC(SSL_F_SSL_SESSION_SET1_ID_CONTEXT),

     "SSL_SESSION_set1_id_context"},

    {ERR_FUNC(SSL_F_SSL_SET_ALPN_PROTOS), "SSL_set_alpn_protos"},

    {ERR_FUNC(SSL_F_SSL_SET_CERT), "ssl_set_cert"},

    {ERR_FUNC(SSL_F_SSL_SET_CIPHER_LIST), "SSL_set_cipher_list"},

    {ERR_FUNC(SSL_F_SSL_SET_FD), "SSL_set_fd"},

ssl/ssl_lib.c

+6 −2
Original line number Diff line number Diff line
@@ -2144,8 +2144,10 @@ int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const unsigned char *protos, 
{

    OPENSSL_free(ctx->alpn_client_proto_list);

    ctx->alpn_client_proto_list = OPENSSL_malloc(protos_len);

    if (ctx->alpn_client_proto_list == NULL)

    if (ctx->alpn_client_proto_list == NULL) {

        SSLerr(SSL_F_SSL_CTX_SET_ALPN_PROTOS, ERR_R_MALLOC_FAILURE);

        return 1;

    }

    memcpy(ctx->alpn_client_proto_list, protos, protos_len);

    ctx->alpn_client_proto_list_len = protos_len;
@@ -2162,8 +2164,10 @@ int SSL_set_alpn_protos(SSL *ssl, const unsigned char *protos, 
{

    OPENSSL_free(ssl->alpn_client_proto_list);

    ssl->alpn_client_proto_list = OPENSSL_malloc(protos_len);

    if (ssl->alpn_client_proto_list == NULL)

    if (ssl->alpn_client_proto_list == NULL) {

        SSLerr(SSL_F_SSL_SET_ALPN_PROTOS, ERR_R_MALLOC_FAILURE);

        return 1;

    }

    memcpy(ssl->alpn_client_proto_list, protos, protos_len);

    ssl->alpn_client_proto_list_len = protos_len;