← Commit list

113685fbc

Denys Vlasenko
Denys Vlasenko
2023-06-07
SUCCESS Duration: 158s

Subject

awk: fix SEGV on read error in -f PROGFILE

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

editors/awk.c +2 -2
editors/awk.c+2 -2
@@ -3609,8 +3609,6 @@ static var *evaluate(node *op, var *res)
#undef sreg
}
-/* -------- main & co. -------- */
-
static int awk_exit(void)
{
unsigned i;
@@ -3717,6 +3715,8 @@ int awk_main(int argc UNUSED_PARAM, char **argv)
g_progname = llist_pop(&list_f);
fd = xopen_stdin(g_progname);
s = xmalloc_read(fd, NULL); /* it's NUL-terminated */
+ if (!s)
+ bb_perror_msg_and_die("read error from '%s'", g_progname);
close(fd);
parse_program(s);
free(s);