Fix missing null terminator in strncpy_fit

drhelius · drhelius · commit af1079716e04 · 2026-03-05T15:14:09.000+01:00
diff --git a/src/common.h b/src/common.h
@@ -184,10 +184,13 @@ inline bool parse_hex_with_prefix(const std::string& hex_str, T* result)
 
 inline char* strncpy_fit(char* dest, const char* src, size_t dest_size)
 {
-    if (dest_size != 0)
-        dest_size -= 1;
+    if (dest_size == 0)
+        return dest;
+
+    strncpy(dest, src, dest_size - 1);
+    dest[dest_size - 1] = '\0';
 
-    return strncpy(dest, src, dest_size);
+    return dest;
 }
 
 inline char* strncat_fit(char* dest, const char* src, size_t dest_size)

Original file line number	Diff line number	Diff line change
`@@ -184,10 +184,13 @@ inline bool parse_hex_with_prefix(const std::string& hex_str, T* result)`
`184`	`184`
`185`	`185`	`inline char* strncpy_fit(char* dest, const char* src, size_t dest_size)`
`186`	`186`	`{`
`187`		`- if (dest_size != 0)`
`188`		`- dest_size -= 1;`
	`187`	`+ if (dest_size == 0)`
	`188`	`+ return dest;`
	`189`	`+`
	`190`	`+ strncpy(dest, src, dest_size - 1);`
	`191`	`+ dest[dest_size - 1] = '\0';`
`189`	`192`
`190`		`- return strncpy(dest, src, dest_size);`
	`193`	`+ return dest;`
`191`	`194`	`}`
`192`	`195`
`193`	`196`	`inline char* strncat_fit(char* dest, const char* src, size_t dest_size)`