projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a50f718
)
Added OPENSSL_assert check as per PR#3377 reported by Rainer Jung <rainer.jung@kippda...
author
Matt Caswell
<matt@openssl.org>
Thu, 12 Jun 2014 19:38:45 +0000
(20:38 +0100)
committer
Matt Caswell
<matt@openssl.org>
Thu, 12 Jun 2014 19:40:54 +0000
(20:40 +0100)
ssl/s3_pkt.c
patch
|
blob
|
history
diff --git
a/ssl/s3_pkt.c
b/ssl/s3_pkt.c
index fb9720f41d5c6e2c29a1ba873208d058c03551f2..02302a5dbf36a2159173e18e075a13d429ec75ec 100644
(file)
--- a/
ssl/s3_pkt.c
+++ b/
ssl/s3_pkt.c
@@
-644,6
+644,7
@@
int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
int i;
s->rwstate=SSL_NOTHING;
+ OPENSSL_assert(s->s3->wnum <= INT_MAX);
tot=s->s3->wnum;
s->s3->wnum=0;
@@
-667,7
+668,7
@@
int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
* buffer ... so we trap and report the error in a way the user
* will notice
*/
- if (
len < tot)
+ if (len < tot)
{
SSLerr(SSL_F_SSL3_WRITE_BYTES,SSL_R_BAD_LENGTH);
return(-1);