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

Fix memory leak.

Browse Source 
Always perform nexproto callback argument initialisation in s_server
otherwise we use uninitialised data if -nocert is specified.
This commit is contained in:
Dr. Stephen Henson 2012-07-03 16:37:50 +00:00
parent 657e29c199
commit dd25165968
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/s_client.c
View File

@ -1965,6 +1965,10 @@ end:
print_stuff(bio_c_out,con,1); print_stuff(bio_c_out,con,1);
SSL_free(con); SSL_free(con);
} }
#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
if (next_proto.data)
OPENSSL_free(next_proto.data);
#endif
if (ctx != NULL) SSL_CTX_free(ctx); if (ctx != NULL) SSL_CTX_free(ctx);
if (cert) if (cert)
X509_free(cert); X509_free(cert);

11
apps/s_server.c
View File

@ -1518,13 +1518,14 @@ bad:
goto end; goto end;
} }
} }
#endif /* OPENSSL_NO_TLSEXT */
}
# ifndef OPENSSL_NO_NEXTPROTONEG #if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
if (next_proto_neg_in) if (next_proto_neg_in)
{ {
unsigned short len; unsigned short len;
next_proto.data = next_protos_parse(&len, next_proto.data = next_protos_parse(&len, next_proto_neg_in);
next_proto_neg_in);
if (next_proto.data == NULL) if (next_proto.data == NULL)
goto end; goto end;
next_proto.len = len; next_proto.len = len;
@ -1533,9 +1534,7 @@ bad:
{ {
next_proto.data = NULL; next_proto.data = NULL;
} }
# endif #endif
#endif /* OPENSSL_NO_TLSEXT */
}
if (s_dcert_file) if (s_dcert_file)