From: Matt Caswell <matt@openssl.org>
Date: Wed, 25 Jan 2017 15:01:43 +0000 (+0000)
Subject: Remove assert from is_partially_overlapping()
X-Git-Tag: OpenSSL_1_1_0d~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b8552dc80a611083754493283e72d51f3015753a;p=oweals%2Fopenssl.git

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)
(cherry picked from commit b153f0921bea38127de0b9440b0487db3004330d)
---

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;
 }