From 5fd8bb304485df17d467629dd31ff28a5945433e Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Tue, 5 Dec 2023 21:51:30 +0100 Subject: [PATCH] tftp fix null termination in str_cat_str fix check if not possible to fit string (did not check if null terminator fits suggested by Lorenz --- project/Core/Src/tftp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/Core/Src/tftp.c b/project/Core/Src/tftp.c index c443c55..b19a12e 100644 --- a/project/Core/Src/tftp.c +++ b/project/Core/Src/tftp.c @@ -28,10 +28,11 @@ static tftp_custom_file_t virt_file[] = {{.name = "index.txt", .data = NULL, .le static int str_cat_str(char* dest, size_t dest_size, const char* src) { size_t dest_len = strlen(dest); size_t src_len = strlen(src); - if (dest_len + src_len > dest_size) { + if (dest_len + src_len >= dest_size) { return -1; } memcpy(dest + dest_len, src, src_len); + dest[dest_len + src_len] = '\0'; return 0; }