Remove assert from is_partially_overlapping()
authorMatt Caswell <matt@openssl.org>
Wed, 25 Jan 2017 15:01:43 +0000 (15:01 +0000)
committerMatt Caswell <matt@openssl.org>
Wed, 25 Jan 2017 15:07:37 +0000 (15:07 +0000)
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)

crypto/evp/evp_enc.c

index ef66cb1de5c753b180b4eeebfdb285a0a7caa79b..bb6dd67c8c0bc191d53488a7d4c9deb4238584a0 100644 (file)
@@ -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;
 }