lib/coreutils
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/coreutils.git synced 2026-10-24 02:08:57 +03:00
Code Activity

maint: join: use a stricter COUNTED_BY on fields

Browse Source 
* src/join.c (struct line): Change the COUNTED_BY to use the nfields
member instead of nfields_allocated.
(extract_field): Increment the count before writing to the last field,
otherwise -fsanitize=bounds would kill the program.
This commit is contained in:
Collin Funk
2026-10-13 21:13:10 -07:00
parent 292bd77de7
commit a53cf09ca1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/join.c
View File

@@ -74,7 +74,7 @@ struct line
struct linebuffer buf; /* The line itself. */
idx_t nfields; /* Number of elements in 'fields'. */
idx_t nfields_allocated; /* Number of elements allocated for 'fields'. */
struct field *fields COUNTED_BY (nfields_allocated);
struct field *fields COUNTED_BY (nfields);
};
/* One or more consecutive lines read from a file that all have the
@@ -294,9 +294,9 @@ extract_field (struct line *line, char *field, idx_t len)
if (line->nfields >= line->nfields_allocated)
line->fields = xpalloc (line->fields, &line->nfields_allocated, 1,
-1, sizeof *line->fields);
line->fields[line->nfields].beg = field;
line->fields[line->nfields].len = len;
++(line->nfields);
idx_t const field_index = line->nfields++;
line->fields[field_index].beg = field;
line->fields[field_index].len = len;
}
static bool