From e2b798c8b329d88e4f38ca4f5c4445eddcfad4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bodo=20M=C3=B6ller?= Date: Thu, 3 Feb 2011 12:03:51 +0000 Subject: Assorted bugfixes: - safestack macro changes for C++ were incomplete - RLE decompression boundary case - SSL 2.0 key arg length check Submitted by: Google (Adam Langley, Neel Mehta, Bodo Moeller) --- crypto/comp/c_rle.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'crypto/comp') diff --git a/crypto/comp/c_rle.c b/crypto/comp/c_rle.c index efd366fa22..18bceae51e 100644 --- a/crypto/comp/c_rle.c +++ b/crypto/comp/c_rle.c @@ -46,7 +46,7 @@ static int rle_expand_block(COMP_CTX *ctx, unsigned char *out, { int i; - if (olen < (ilen-1)) + if (ilen == 0 || olen < (ilen-1)) { /* ZZZZZZZZZZZZZZZZZZZZZZ */ return(-1); @@ -59,4 +59,3 @@ static int rle_expand_block(COMP_CTX *ctx, unsigned char *out, } return(ilen-1); } - -- cgit v1.2.3