Module Name: src
Committed By: christos
Date: Thu May 15 12:53:52 UTC 2014
Modified Files:
src/crypto/external/bsd/openssl/dist/ssl: s3_pkt.c
Log Message:
Avoid NULL dereference. (FreeBSD SA14:10)
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c
diff -u src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c:1.14 src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c:1.15
--- src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c:1.14 Sun Apr 13 09:14:15 2014
+++ src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c Thu May 15 08:53:52 2014
@@ -658,6 +658,10 @@ static int do_ssl3_write(SSL *s, int typ
if (i <= 0)
return(i);
/* if it went, fall through and send more stuff */
+ /* we may have released our buffer, so get it again */
+ if (wb->buf == NULL)
+ if (!ssl3_setup_write_buffer(s))
+ return -1;
}
if (len == 0 && !create_empty_fragment)
