From 31d56675164777b9f46f639eebf225ff86284be8 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Thu, 4 Jan 2024 17:58:05 +0100 Subject: [PATCH] Fix usage of strncat --- src/datenklo/device.c | 4 ++-- src/jolly/dsp.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/datenklo/device.c b/src/datenklo/device.c index 462c08e..3379da0 100644 --- a/src/datenklo/device.c +++ b/src/datenklo/device.c @@ -467,7 +467,7 @@ static void *device_child(void *arg) const char *dev_info_argv[] = { dev_name }; struct cuse_info ci; - strncat(dev_name, device->name, sizeof(dev_name) - strlen(device->name) - 1); + strncat(dev_name, device->name, sizeof(dev_name) - strlen(dev_name) - 1); memset(&ci, 0, sizeof(ci)); ci.dev_major = device->major; @@ -520,7 +520,7 @@ void *device_init(void *inst, const char *name, int (*open)(void *inst, int flag } pthread_getname_np(device->thread, tname, sizeof(tname)); - strncat(tname, "-device", sizeof(tname) - 7 - 1); + strncat(tname, "-device", sizeof(tname) - strlen(tname) - 1); tname[sizeof(tname) - 1] = '\0'; pthread_setname_np(device->thread, tname); diff --git a/src/jolly/dsp.c b/src/jolly/dsp.c index 9d2ab41..7bb3aee 100644 --- a/src/jolly/dsp.c +++ b/src/jolly/dsp.c @@ -144,7 +144,7 @@ void set_speech_string(jolly_t *jolly, char announcement, const char *number) { jolly->speech_string[0] = announcement; jolly->speech_string[1] = '\0'; - strncat(jolly->speech_string, number, sizeof(jolly->speech_string) - strlen(number) - 1); + strncat(jolly->speech_string, number, sizeof(jolly->speech_string) - strlen(jolly->speech_string) - 1); jolly->speech_digit = 0; jolly->speech_pos = 0; }