From 30a8e1b175b105708837df563d0a57e108acebdf Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Stelmach?= Date: Tue, 18 Jan 2022 15:25:31 +0100 Subject: [PATCH] kdbus: Replace strcat() with strncat() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Ie8c68c7a48bcb359a2c8e649a96f7d538ed26ad8 Signed-off-by: Łukasz Stelmach --- tests/kdbus/kdbus-test.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/kdbus/kdbus-test.h b/tests/kdbus/kdbus-test.h index e0a6abc..6d3034d 100644 --- a/tests/kdbus/kdbus-test.h +++ b/tests/kdbus/kdbus-test.h @@ -43,12 +43,12 @@ enum { __auto_type const _ASSERT_RETURN_VAL_val1_ = (val1);\ 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");\ + char _ASSERT_REL_fmt_[sizeof("[tid %u] Assertion '(")+4+sizeof("=%s) %s (")+4+sizeof("=%s)' failed in %s(), %s:%d\n")];\ + strncpy(_ASSERT_REL_fmt_, "[tid %u] Assertion '(", 22);\ + strncat(_ASSERT_REL_fmt_, PRINTF_FMT(_ASSERT_RETURN_VAL_val0_), 4);\ + strncat(_ASSERT_REL_fmt_, "=%s) %s (", 9);\ + strncat(_ASSERT_REL_fmt_, PRINTF_FMT(_ASSERT_RETURN_VAL_val1_), 4);\ + strncat(_ASSERT_REL_fmt_, "=%s)' failed in %s(), %s:%d\n", 29);\ 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;\ }\ -- 2.7.4