sani7/2023-Webservices_And_Applications
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tftp

Browse Source 
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
This commit is contained in:
Sander Speetjens
2023-12-05 21:51:30 +01:00
parent 00d5f3a040
commit 5fd8bb3044
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
project/Core/Src/tftp.c
View File

@@ -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) { static int str_cat_str(char* dest, size_t dest_size, const char* src) {
size_t dest_len = strlen(dest); size_t dest_len = strlen(dest);
size_t src_len = strlen(src); size_t src_len = strlen(src);
if (dest_len + src_len > dest_size) { if (dest_len + src_len >= dest_size) {
return -1; return -1;
} }
memcpy(dest + dest_len, src, src_len); memcpy(dest + dest_len, src, src_len);
dest[dest_len + src_len] = '\0';
return 0; return 0;
} }