From 22a8094b41b2606084dc0c0c70487e5ed0fcb652 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Wed, 27 Dec 2023 17:07:32 +0100
Subject: Re-enable previously disabled overlap checks

They were previously disabled in 80a83a5
---
 tests/test_stpncpy_dynamic_write.c   |  5 +++--
 tests/test_stpncpy_overwrite_over.c  |  5 +++--
 tests/test_stpncpy_overwrite_under.c | 10 ++++++----
 tests/test_strncpy_overwrite_over.c  | 13 +++++++++----
 tests/test_strncpy_overwrite_under.c |  2 --
 5 files changed, 21 insertions(+), 14 deletions(-)

(limited to 'tests')

diff --git a/tests/test_stpncpy_dynamic_write.c b/tests/test_stpncpy_dynamic_write.c
index 8fbfe7e..14f6fd9 100644
--- a/tests/test_stpncpy_dynamic_write.c
+++ b/tests/test_stpncpy_dynamic_write.c
@@ -3,8 +3,9 @@
 #include <string.h>
 
 int main(int argc, char** argv) {
-  char buffer[8] = {0};
-  stpncpy(buffer, "1234567", 5);
+  char buffer[] = {'A', 'B', 'C', 'D', 'E', 'F', '\0'};
+
+  stpncpy(buffer, "1234567", 3);
   puts(buffer);
 
   CHK_FAIL_START
diff --git a/tests/test_stpncpy_overwrite_over.c b/tests/test_stpncpy_overwrite_over.c
index 004e2b8..21c88ce 100644
--- a/tests/test_stpncpy_overwrite_over.c
+++ b/tests/test_stpncpy_overwrite_over.c
@@ -3,15 +3,16 @@
 #include <string.h>
 
 int main(int argc, char** argv) {
-#if 0
   char buffer[9] = {'A', 'A', 'A', 'A', 'B', 'B', 'B', 'B', '\0'};
   puts(buffer);
 
+  stpncpy(buffer, buffer+5, 2);
+  puts(buffer);
+
   CHK_FAIL_START
   stpncpy(buffer+1, buffer, 5);
   CHK_FAIL_END
 
   puts(buffer);
-#endif
   return ret;
 }
diff --git a/tests/test_stpncpy_overwrite_under.c b/tests/test_stpncpy_overwrite_under.c
index 845ae29..3b435de 100644
--- a/tests/test_stpncpy_overwrite_under.c
+++ b/tests/test_stpncpy_overwrite_under.c
@@ -3,15 +3,17 @@
 #include <string.h>
 
 int main(int argc, char** argv) {
-#if 0
   char buffer[9] = {'A', 'A', 'A', 'A', 'B', 'B', 'B', 'B', '\0'};
   puts(buffer);
 
+  stpncpy(buffer+5, buffer, 2);
+  puts(buffer);
+
+  char buffer2[] = {'A', 'A', 'A', 'A', 'B', 'B', 'B', 'B', '\0'};
   CHK_FAIL_START
-  stpncpy(buffer-1, buffer, 5);
+  stpncpy(buffer2-1, buffer2, 5);
   CHK_FAIL_END
 
-  puts(buffer);
-#endif
+  puts(buffer2);
   return ret;
 }
diff --git a/tests/test_strncpy_overwrite_over.c b/tests/test_strncpy_overwrite_over.c
index 94b6d2b..d99d270 100644
--- a/tests/test_strncpy_overwrite_over.c
+++ b/tests/test_strncpy_overwrite_over.c
@@ -3,15 +3,20 @@
 #include <string.h>
 
 int main(int argc, char** argv) {
-#if 0
   char buffer[9] = {'A', 'A', 'A', 'A', 'B', 'B', 'B', 'B', '\0'};
   puts(buffer);
 
+  strncpy(buffer, buffer+4, 1);
+  puts(buffer);
+
+  strncpy(buffer+6, buffer, 1);
+  puts(buffer);
+
+  char buffer2[9] = {'A', 'A', 'A', 'A', 'B', 'B', 'B', 'B', '\0'};
   CHK_FAIL_START
-  strncpy(buffer+1, buffer, 5);
+  strncpy(buffer2+1, buffer2, 5);
   CHK_FAIL_END
 
-  puts(buffer);
-#endif
+  puts(buffer2);
   return ret;
 }
diff --git a/tests/test_strncpy_overwrite_under.c b/tests/test_strncpy_overwrite_under.c
index 8a0a4af..f554b28 100644
--- a/tests/test_strncpy_overwrite_under.c
+++ b/tests/test_strncpy_overwrite_under.c
@@ -3,7 +3,6 @@
 #include <string.h>
 
 int main(int argc, char** argv) {
-#if 0
   char buffer[9] = {'A', 'A', 'A', 'A', 'B', 'B', 'B', 'B', '\0'};
   puts(buffer);
 
@@ -12,6 +11,5 @@ int main(int argc, char** argv) {
   CHK_FAIL_END
 
   puts(buffer);
-#endif
   return ret;
 }
-- 
cgit v1.3