commit f41eb861498d758cec410b13efe5dabcc2e9830d
author Adam Langley <agl@google.com> Mon Mar 09 17:49:31 2015 -0700
committer Adam Langley <agl@google.com> Mon Mar 09 19:17:48 2015 -0700
tree 45498d8b9076c7fca22625a37406ed9388db9b14
parent 10bec39d0ea79b1c505366c2b793511a2815f277

Switch an assert back to a check.

The assert was supposed to be *added* in fcf25833 but instead replaced
the check.

BUG=465557

Change-Id: I0d3db5038515021e5bdd1ccb9ff08d4f78552621
Reviewed-on: https://boringssl-review.googlesource.com/3850
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>

ssl/s3_pkt.c

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 95737a7..69cdb1e 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -201,7 +201,10 @@
     rb->offset = len + align;
   }
 
-  assert(n <= (int)(rb->len - rb->offset));
+  if (n > (int)(rb->len - rb->offset)) {
+    OPENSSL_PUT_ERROR(SSL, ssl3_read_n, ERR_R_INTERNAL_ERROR);
+    return -1;
+  }
 
   if (!s->read_ahead) {
     /* ignore max parameter */