[git commit] awk: fix SEGV on read error in -f PROGFILE

Denys Vlasenko vda.linux at googlemail.com
Wed Jun 7 08:54:34 UTC 2023


commit: https://git.busybox.net/busybox/commit/?id=113685fbcd4c3432ec9b640583d50ba8da2102e8
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
awk_main                                             829     843     +14

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 editors/awk.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/editors/awk.c b/editors/awk.c
index b3871ffc5..df9b7fdc9 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -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);


More information about the busybox-cvs mailing list