Include space for alignment in read buffer resize check
Change-Id: I0c7e2612b9b79cdd49096144aad5f0009bcb3857
http://code.google.com/p/android/issues/detail?id=15356
Bug: 4074737
diff --git a/patches/small_records.patch b/patches/small_records.patch
index f5f2286..a2ea51c 100644
--- a/patches/small_records.patch
+++ b/patches/small_records.patch
@@ -157,7 +157,7 @@
+ /* If we receive a valid record larger than the current buffer size,
+ * allocate some memory for it.
+ */
-+ if (rr->length > s->s3->rbuf.len - SSL3_RT_HEADER_LENGTH)
++ if (rr->length > s->s3->rbuf.len - SSL3_RT_HEADER_LENGTH - align)
+ {
+ if ((p=OPENSSL_realloc(s->s3->rbuf.buf, rr->length + SSL3_RT_HEADER_LENGTH + align))==NULL)
+ {
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 51f21e0..c9ef2cd 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -359,7 +359,7 @@
/* If we receive a valid record larger than the current buffer size,
* allocate some memory for it.
*/
- if (rr->length > s->s3->rbuf.len - SSL3_RT_HEADER_LENGTH)
+ if (rr->length > s->s3->rbuf.len - SSL3_RT_HEADER_LENGTH - align)
{
if ((p=OPENSSL_realloc(s->s3->rbuf.buf, rr->length + SSL3_RT_HEADER_LENGTH + align))==NULL)
{
