From: Michal Bloch <m.bloch@samsung.com>
Date: Tue, 18 Jan 2022 16:16:42 +0000 (+0100)
Subject: straycat corner
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fsandbox%2Fmbloch%2Fstraycat;p=platform%2Fkernel%2Flinux-tizen-modules-source.git

straycat corner

Change-Id: I4c498a0758e42ee88cade6b9f4c57d99b00885cb
Signed-off-by: Michal Bloch <m.bloch@samsung.com>
---

diff --git a/packaging/linux-tizen-modules-source.spec b/packaging/linux-tizen-modules-source.spec
index a614f34..339163e 100644
--- a/packaging/linux-tizen-modules-source.spec
+++ b/packaging/linux-tizen-modules-source.spec
@@ -25,6 +25,8 @@ Group:          System/Kernel
 Provides:       linux-kernel-kdbus-tests
 Provides:       linux-kernel-logger-tests
 BuildRequires:  pkgconfig(libcap)
+BuildRequires:  ??? bsd/string.h
+
 %description    -n linux-tizen-modules-tests
 This package contains tests for Tizen-specific kernel modules.
 
diff --git a/tests/kdbus/kdbus-test.h b/tests/kdbus/kdbus-test.h
index e0a6abc..36950ae 100644
--- a/tests/kdbus/kdbus-test.h
+++ b/tests/kdbus/kdbus-test.h
@@ -3,6 +3,7 @@
 
 #include <pthread.h>
 #include <sys/syscall.h>
+#include <bsd/string.h>
 #include "kdbus-util.h"
 
 struct kdbus_test_env {
@@ -44,11 +45,11 @@ enum {
 	if (!(_ASSERT_RETURN_VAL_val0_ relop _ASSERT_RETURN_VAL_val1_)) {			\
 		/* must assemble format string in runtime because _Generic does not play well with string constant concatenation */\
 		char _ASSERT_REL_fmt_[sizeof("[tid %u] Assertion '(")+3+sizeof("=%s) %s (")+3+sizeof("=%s)' failed in %s(), %s:%d\n")];\
-		strcpy(_ASSERT_REL_fmt_, "[tid %u] Assertion '(");\
-		strcat(_ASSERT_REL_fmt_, PRINTF_FMT(_ASSERT_RETURN_VAL_val0_));\
-		strcat(_ASSERT_REL_fmt_, "=%s) %s (");\
-		strcat(_ASSERT_REL_fmt_, PRINTF_FMT(_ASSERT_RETURN_VAL_val1_));\
-		strcat(_ASSERT_REL_fmt_, "=%s)' failed in %s(), %s:%d\n");\
+		strlcpy(_ASSERT_REL_fmt_, "[tid %u] Assertion '("             , sizeof _ASSERT_REL_fmt_);\
+		strlcat(_ASSERT_REL_fmt_, PRINTF_FMT(_ASSERT_RETURN_VAL_val0_), sizeof _ASSERT_REL_fmt_);\
+		strlcat(_ASSERT_REL_fmt_, "=%s) %s ("                         , sizeof _ASSERT_REL_fmt_);\
+		strlcat(_ASSERT_REL_fmt_, PRINTF_FMT(_ASSERT_RETURN_VAL_val1_), sizeof _ASSERT_REL_fmt_);\
+		strlcat(_ASSERT_REL_fmt_, "=%s)' failed in %s(), %s:%d\n"     , sizeof _ASSERT_REL_fmt_);\
 		print(_ASSERT_REL_fmt_, syscall(SYS_gettid), PRINTF_ARG(_ASSERT_RETURN_VAL_val0_), val0s, #relop, PRINTF_ARG(_ASSERT_RETURN_VAL_val1_), val1s, __func__, __FILE__, __LINE__);\
 		onfailure;\
 	}\