Commit e9e688ef authored by Jonas Maebe's avatar Jonas Maebe Committed by Kurt Roeckx
Browse files

serverinfo_process_buffer: check result of realloc(ctx->cert->key->serverinfo)... 


serverinfo_process_buffer: check result of realloc(ctx->cert->key->serverinfo) and don't leak memory if it fails

Signed-off-by: default avatarKurt Roeckx <kurt@roeckx.be>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent bf8e7047

ssl/ssl_rsa.c

+5 −2
Original line number Diff line number Diff line
@@ -948,6 +948,8 @@ static int serverinfo_process_buffer(const unsigned char *serverinfo, 
int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo,

			   size_t serverinfo_length)

	{

	unsigned char *new_serverinfo;



	if (ctx == NULL || serverinfo == NULL || serverinfo_length == 0)

		{

		SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO,ERR_R_PASSED_NULL_PARAMETER);
@@ -968,13 +970,14 @@ int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo, 
		SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO,ERR_R_INTERNAL_ERROR);

		return 0;

		}

	ctx->cert->key->serverinfo = OPENSSL_realloc(ctx->cert->key->serverinfo,

	new_serverinfo = OPENSSL_realloc(ctx->cert->key->serverinfo,

						     serverinfo_length);

	if (ctx->cert->key->serverinfo == NULL)

	if (new_serverinfo == NULL)

		{

		SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO,ERR_R_MALLOC_FAILURE);

		return 0;

		}

	ctx->cert->key->serverinfo = new_serverinfo;

	memcpy(ctx->cert->key->serverinfo, serverinfo, serverinfo_length);

	ctx->cert->key->serverinfo_length = serverinfo_length;