system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 02:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

bsdinstall: Replace correct, but fragile, string builder with open_memstream.

Browse source 
The old one triggered a false positive -Warray-bounds from GCC (the
compiler assumed len was always 0), but it was also fragile with
manually computed lengths paired with strcat vs using a string
builder.

Differential Revision:	https://reviews.freebsd.org/D40658
This commit is contained in:
John Baldwin 2023-06-27 10:19:32 -07:00
parent f5e7330633
commit f66a8328c3
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
usr.sbin/bsdinstall/partedit/scripted.c
View file

@ -195,23 +195,26 @@ int parse_disk_config(char *input)
int
scripted_editor(int argc, const char **argv)
{
char *token;
int i, error = 0, len = 0;
FILE *fp;
char *input, *token;
size_t len;
int i, error = 0;
for (i = 1; i < argc; i++)
len += strlen(argv[i]) + 1;
char inputbuf[len], *input = inputbuf;
strcpy(input, argv[1]);
fp = open_memstream(&input, &len);
fputs(argv[1], fp);
for (i = 2; i < argc; i++) {
strcat(input, " ");
strcat(input, argv[i]);
fprintf(fp, " %s", argv[i]);
}
fclose(fp);
while ((token = strsep(&input, ";")) != NULL) {
error = parse_disk_config(token);
if (error != 0)
if (error != 0) {
free(input);
return (error);
}
}
free(input);
return (0);
}