diff options
| author | Matt Caswell <matt@openssl.org> | 2017-01-25 15:01:43 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-01-25 15:02:45 +0000 |
| commit | b153f0921bea38127de0b9440b0487db3004330d (patch) | |
| tree | 10a91cc87c01aea8b1311d9e9a80d978a39ec551 /crypto/evp | |
| parent | ef055ec536a3c6e698dd9f45b41d57a32366b4fa (diff) | |
Remove assert from is_partially_overlapping()
This function is used to validate application supplied parameters. An
assert should be used to check for an error that is internal to OpenSSL.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2275)
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/evp_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index ef66cb1de5..bb6dd67c8c 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -286,7 +286,7 @@ int is_partially_overlapping(const void *ptr1, const void *ptr2, int len) */ int overlapped = (len > 0) & (diff != 0) & ((diff < (PTRDIFF_T)len) | (diff > (0 - (PTRDIFF_T)len))); - assert(!overlapped); + return overlapped; } |