1a303f4853
- fix leak in error handling of d2i_SSL_SESSION()
28 lines
710 B
Diff
28 lines
710 B
Diff
Index: openssl/ssl/ssl_asn1.c
|
|
RCS File: /v/openssl/cvs/openssl/ssl/ssl_asn1.c,v
|
|
rcsdiff -q -kk '-r1.36.2.2' '-r1.36.2.3' -u '/v/openssl/cvs/openssl/ssl/ssl_asn1.c,v' 2>/dev/null
|
|
--- openssl/ssl/ssl_asn1.c 2009/08/05 15:29:14 1.36.2.2
|
|
+++ openssl/ssl/ssl_asn1.c 2009/09/02 13:20:22 1.36.2.3
|
|
@@ -413,8 +413,8 @@
|
|
}
|
|
else
|
|
{
|
|
- SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_UNKNOWN_SSL_VERSION);
|
|
- return(NULL);
|
|
+ c.error=SSL_R_UNKNOWN_SSL_VERSION;
|
|
+ goto err;
|
|
}
|
|
|
|
ret->cipher=NULL;
|
|
@@ -505,8 +505,8 @@
|
|
{
|
|
if (os.length > SSL_MAX_SID_CTX_LENGTH)
|
|
{
|
|
- ret->sid_ctx_length=os.length;
|
|
- SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_BAD_LENGTH);
|
|
+ c.error=SSL_R_BAD_LENGTH;
|
|
+ goto err;
|
|
}
|
|
else
|
|
{
|