diff options
| author |   djm <djm@openbsd.org> | 2011-11-03 02:34:28 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2011-11-03 02:34:28 +0000 |
| commit | c32db552feb5310e2f4b27f02d313cfbf0b82a8a (patch) | |
| tree | b7b6074be11e20dcb5106c8a27f96bcb3fcdf5c2 /lib/libssl/src/crypto/comp/c_rle.c | |
| parent | import OpenSSL 1.0.0e (diff) | |
| download | wireguard-openbsd-c32db552feb5310e2f4b27f02d313cfbf0b82a8a.tar.xz wireguard-openbsd-c32db552feb5310e2f4b27f02d313cfbf0b82a8a.zip | |
openssl-1.0.0e: resolve conflicts
Diffstat (limited to 'lib/libssl/src/crypto/comp/c_rle.c')
| -rw-r--r-- | lib/libssl/src/crypto/comp/c_rle.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libssl/src/crypto/comp/c_rle.c b/lib/libssl/src/crypto/comp/c_rle.c index efd366fa223..18bceae51e7 100644 --- a/lib/libssl/src/crypto/comp/c_rle.c +++ b/lib/libssl/src/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); } - |