shithub: riscv

Info  •  Files  •  Log  •  Branches

awk: fix nextfile crash (thanks leetspete)

to reproduce the bug:

term% awk 'BEGIN{nextfile; nextfile;}'
sys: trap: fault read addr=0x10 pc=0x00019a3a
awk 6584: suicide: sys: trap: fault read addr=0x10 pc=0x00019a3a

--- a/sys/src/cmd/awk/lib.c

+++ b/sys/src/cmd/awk/lib.c

@@ -155,10 +155,7 @@

 			return 1;

 		}

 		/* Beof arrived on this file; set up next */

-		if (infile != &stdin)

-			Bterm(infile);

-		infile = nil;

-		argno++;

+		nextfile();

 	}

 	*pbuf = buf;

 	*pbufsize = bufsize;

@@ -167,7 +164,7 @@

 void nextfile(void)

 {

-	if (infile != &stdin)

+	if (infile != nil && infile != &stdin)

 		Bterm(infile);

 	infile = nil;

 	argno++;