3 files changed, 35 insertions, 1 deletions

diff --git a/tests/Makefile b/tests/Makefile
index 1f80c32..25f6f66 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -8,7 +8,9 @@ TARGETS=test_memcpy_static_write  \
         test_memmove_static_write  \
         test_memmove_dynamic_write \
         test_memmove_static_read   \
-        test_memmove_dynamic_read
+        test_memmove_dynamic_read  \
+        test_memset_static_write   \
+        test_memset_dynamic_write  \
 
 .SILENT:
 
diff --git a/tests/test_memset_dynamic_write.c b/tests/test_memset_dynamic_write.c
new file mode 100644
index 0000000..5e1d8a3
--- /dev/null
+++ b/tests/test_memset_dynamic_write.c
@@ -0,0 +1,16 @@
+#include "common.h"
+
+#include <string.h>
+
+int main(int argc, char** argv) {
+  char buffer[8] = {0};
+  memset(buffer, 0, sizeof(buffer) - 1);
+  puts(buffer);
+
+  CHK_FAIL_START
+  memset(buffer, 0, argc);
+  CHK_FAIL_END
+
+  puts(buffer);
+  return ret;
+}
diff --git a/tests/test_memset_static_write.c b/tests/test_memset_static_write.c
new file mode 100644
index 0000000..dc30ed8
--- /dev/null
+++ b/tests/test_memset_static_write.c
@@ -0,0 +1,16 @@
+#include "common.h"
+
+#include <string.h>
+
+int main(int argc, char** argv) {
+  char buffer[8] = {0};
+  memset(buffer, 0, sizeof(buffer) - 1);
+  puts(buffer);
+
+  CHK_FAIL_START
+  memset(buffer, 0, sizeof(buffer) + 1);
+  CHK_FAIL_END
+
+  puts(buffer);
+  return ret;
+}