SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

string-util: make make_cstring() take void* rather than char*

Browse Source 
It is typically used for making C string embedded in a binary data.
Hence, the input pointer may not be char*.
This commit is contained in:
Yu Watanabe
2026-04-17 19:24:53 +02:00
committed by Zbigniew Jędrzejewski-Szmek
parent f46ad8b4ba
commit 8bb669712e
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/string-util.c
+3 -3
View File
@@ -1292,7 +1292,7 @@ char* string_replace_char(char *str, char old_char, char new_char) {
return str;
}
int make_cstring(const char *s, size_t n, MakeCStringMode mode, char **ret) {
int make_cstring(const void *s, size_t n, MakeCStringMode mode, char **ret) {
char *b;
assert(s || n == 0);
@@ -1311,11 +1311,11 @@ int make_cstring(const char *s, size_t n, MakeCStringMode mode, char **ret) {
b = new0(char, 1);
} else {
const char *nul;
const uint8_t *nul;
nul = memchr(s, 0, n);
if (nul) {
if (nul < s + n - 1 || /* embedded NUL? */
if (nul < (const uint8_t*) s + n - 1 || /* embedded NUL? */
mode == MAKE_CSTRING_REFUSE_TRAILING_NUL)
return -EINVAL;