commit 661965212711fdd8c447e5d694da778c4813796f
author Armando Montanez <amontanez@google.com> Mon Nov 26 16:37:58 2018 -0800
committer Armando Montanez <amontanez@google.com> Tue Dec 04 10:57:25 2018 -0800
tree c8b26eba52a27f5ec4d52033de3db2ca8f39aea4
parent f61897ea129c33a7d864696bf9d26e9af997ae29

Fix memcpy test to prevent unintended overlap

Change-Id: I157f3ef8e923ea33437cfe754742b6009b8fe00e

third_party/nacl-ported-tests/libc/memcpy_move_set.cc

diff --git a/third_party/nacl-ported-tests/libc/memcpy_move_set.cc b/third_party/nacl-ported-tests/libc/memcpy_move_set.cc
index 57c3017..4e1cb0d 100644
--- a/third_party/nacl-ported-tests/libc/memcpy_move_set.cc
+++ b/third_party/nacl-ported-tests/libc/memcpy_move_set.cc
@@ -81,7 +81,7 @@
    * check that the source and the destination match after the call.
    */
   void checked_memcpy(void *dst, void *src, unsigned n) {
-    ASSERT_LT((unsigned char *)dst + n, (unsigned char *)buf + total_buf_len);
+    ASSERT_LE((unsigned char *)dst + n, (unsigned char *)buf + total_buf_len);
     void *ret = memcpy(dst, src, n);
     char formatted[256];
     if (ret != dst) {
@@ -218,7 +218,7 @@
 /* Test 11: memcpy large chunk, from unaligned to aligned address */
 TEST_F(MemCopyMoveTests, TestMemcpyLargeChunkUToA) {
   src = arrptr + 1;
-  dst = arrptr + large_length;
+  dst = arrptr + large_length + medium_length;
   checked_memcpy(dst, src, large_length);
   EXPECT_EQ(130u, (unsigned)dst[129]);
 }