generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Free malloc data on encoding errors.

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2015-04-25 22:55:36 -04:00
parent 46aa607867
commit a194ee7b9a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/s_server.c
View File

@ -3169,6 +3169,7 @@ static int add_session(SSL *ssl, SSL_SESSION *session)
sess->derlen = i2d_SSL_SESSION(session, NULL); sess->derlen = i2d_SSL_SESSION(session, NULL);
if (sess->derlen < 0) { if (sess->derlen < 0) {
BIO_printf(bio_err, "Error encoding session\n"); BIO_printf(bio_err, "Error encoding session\n");
OPENSSL_free(sess);
return 0; return 0;
} }
@ -3176,10 +3177,8 @@ static int add_session(SSL *ssl, SSL_SESSION *session)
sess->der = OPENSSL_malloc(sess->derlen); sess->der = OPENSSL_malloc(sess->derlen);
if (!sess->id || !sess->der) { if (!sess->id || !sess->der) {
BIO_printf(bio_err, "Out of memory adding to external cache\n"); BIO_printf(bio_err, "Out of memory adding to external cache\n");
if (sess->id) OPENSSL_free(sess->id);
OPENSSL_free(sess->id); OPENSSL_free(sess->der);
if (sess->der)
OPENSSL_free(sess->der);
OPENSSL_free(sess); OPENSSL_free(sess);
return 0; return 0;
} }
@ -3187,7 +3186,10 @@ static int add_session(SSL *ssl, SSL_SESSION *session)
/* Assume it still works. */ /* Assume it still works. */
if (i2d_SSL_SESSION(session, &p) != sess->derlen) { if (i2d_SSL_SESSION(session, &p) != sess->derlen) {
BIO_printf(bio_err, "Error encoding session\n"); BIO_printf(bio_err, "Re-encoding session strangeness\n");
OPENSSL_free(sess->id);
OPENSSL_free(sess->der);
OPENSSL_free(sess);
return 0; return 0;
} }