summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS6
-rw-r--r--src/plugins/unittest/string_test.c17
2 files changed, 19 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6f6718a98a3..586e3e0c722 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -436,6 +436,12 @@ I: dns
M: Dave Barach <dave@barachs.net>
F: src/plugins/dns/
+Plugin - Unit Tests
+I: unittest
+M: Dave Barach <dave@barachs.net>
+M: Florin Coras <fcoras@cisco.com
+F: src/plugins/unittest/
+
Test Infrastructure
I: tests
M: Klement Sekera <ksekera@cisco.com>
diff --git a/src/plugins/unittest/string_test.c b/src/plugins/unittest/string_test.c
index 5016a86ac82..95a95d78c1d 100644
--- a/src/plugins/unittest/string_test.c
+++ b/src/plugins/unittest/string_test.c
@@ -85,11 +85,20 @@ test_memcpy_s (vlib_main_t * vm, unformat_input_t * input)
if (src[i] != dst[i])
return -1;
- /* Size fail */
- err = memcpy_s (dst + 1, sizeof (dst) - 1, src, sizeof (src));
+ /*
+ * Size test: sizeof (src) > sizeof (dst)
+ * Skip this test when __builtin_constant_p (sizeof (src)) is true.
+ * This is because memcpy_s_inline skips all the errors checking when the
+ * the above buildin function returns true which may cause overrun problem
+ * for dst buffer if this test is executed.
+ */
+ if (__builtin_constant_p (sizeof (src)) == 0)
+ {
+ err = memcpy_s (dst + 1, sizeof (dst) - 1, src, sizeof (src));
- if (err == EOK)
- return -1;
+ if (err == EOK)
+ return -1;
+ }
/* overlap fail */
err = memcpy_s (dst, sizeof (dst), dst + 1, sizeof (dst) - 1);