From b8552dc80a611083754493283e72d51f3015753a Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 25 Jan 2017 15:01:43 +0000 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/2275) (cherry picked from commit b153f0921bea38127de0b9440b0487db3004330d) --- crypto/evp/evp_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- 2.25.1