ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cut: allocate "printed" only if OPT_CHAR or OPT_BYTE

Browse source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2024-12-10 01:50:58 +01:00
parent ad12ab439b
commit 478ac90f2c
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
coreutils/cut.c
View file

@ -101,12 +101,13 @@ static void cut_file(FILE *file, const char *delim, const char *odelim,
/* set up a list so we can keep track of what's been printed */ /* set up a list so we can keep track of what's been printed */
int linelen = strlen(line); int linelen = strlen(line);
char *printed = xzalloc(linelen + 1);
char *orig_line = line; char *orig_line = line;
unsigned cl_pos = 0; unsigned cl_pos = 0;
/* cut based on chars/bytes XXX: only works when sizeof(char) == byte */ /* cut based on chars/bytes XXX: only works when sizeof(char) == byte */
if (option_mask32 & (OPT_CHAR | OPT_BYTE)) { if (option_mask32 & (OPT_CHAR | OPT_BYTE)) {
char *printed = xzalloc(linelen + 1);
/* print the chars specified in each cut list */ /* print the chars specified in each cut list */
for (; cl_pos < nlists; cl_pos++) { for (; cl_pos < nlists; cl_pos++) {
int spos; int spos;
@ -120,6 +121,7 @@ static void cut_file(FILE *file, const char *delim, const char *odelim,
} }
} }
} }
free(printed);
} else if (*delim == '\n') { /* cut by lines */ } else if (*delim == '\n') { /* cut by lines */
int spos = cut_lists[cl_pos].startpos; int spos = cut_lists[cl_pos].startpos;
@ -214,9 +216,8 @@ static void cut_file(FILE *file, const char *delim, const char *odelim,
putchar('\n'); putchar('\n');
next_line: next_line:
linenum++; linenum++;
free(printed);
free(orig_line); free(orig_line);
} } /* while (got line) */
#undef opt_REGEX #undef opt_REGEX
} }