vftdan
/
event-sequence-transformation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Safer string concatenation

This commit is contained in:
Vftdan 2024-08-18 19:59:03 +02:00
parent 97b90cd1af
commit 244bb719b1
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config.c
View File

@ -168,12 +168,19 @@ put_enum_value(ConstantRegistry *registry, const char *enum_name, const char *me
} }
size_t enum_len = strlen(enum_name); size_t enum_len = strlen(enum_name);
size_t member_len = strlen(member_name); size_t member_len = strlen(member_name);
size_t mem_size = enum_len + /* "." */ 1 + member_len + /* terminator */ 1; size_t mem_size = enum_len + /* "." */ 1 + member_len + /* terminator */ 1 + /* additional protection ??? */ 2;
if (mem_size <= enum_len || mem_size <= member_len) {
// Overflow
return;
}
char* qualified_name = malloc(mem_size); char* qualified_name = malloc(mem_size);
if (!qualified_name) {
return;
}
qualified_name[0] = '\0'; qualified_name[0] = '\0';
strncat(qualified_name, enum_name, enum_len); strncat(qualified_name, enum_name, enum_len + 1); // -Wstringop-truncation, why?
strncat(qualified_name, ".", 1); strncat(qualified_name, ".", 1); // But you don't want 2 here?
strncat(qualified_name, member_name, member_len); strncat(qualified_name, member_name, member_len + 1);
hash_table_insert(registry, hash_table_key_from_cstr(qualified_name), &value); hash_table_insert(registry, hash_table_key_from_cstr(qualified_name), &value);
free(qualified_name); free(qualified_name);
} }