From ddea2c8abfaefc411488f5533cfd3c05fa3e86ff Mon Sep 17 00:00:00 2001 From: millert Date: Fri, 12 Nov 2021 15:16:58 +0000 Subject: [PATCH] Update awk to Nov 03, 2021 version. We already had the fix so no actual code changes. --- usr.bin/awk/FIXES | 7 ++++++- usr.bin/awk/main.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/usr.bin/awk/FIXES b/usr.bin/awk/FIXES index 4cffc444ad9..a9b01b1a135 100644 --- a/usr.bin/awk/FIXES +++ b/usr.bin/awk/FIXES @@ -1,4 +1,4 @@ -/* $OpenBSD: FIXES,v 1.41 2021/11/02 15:29:41 millert Exp $ */ +/* $OpenBSD: FIXES,v 1.42 2021/11/12 15:16:58 millert Exp $ */ /**************************************************************** Copyright (C) Lucent Technologies 1997 All Rights Reserved @@ -26,6 +26,11 @@ THIS SOFTWARE. This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Nov 03, 2021: + getline accesses uninitialized data after getrec() + returns 0 on EOF and leaves the contents of buf unchanged. + Thanks to Volodymyr Gubarkov, and Todd C Miller. + Oct 12, 2021: The fix for #83 changed the code to insert 2 chars, but the call to adjbuf just above it only allows for 1 char. This can diff --git a/usr.bin/awk/main.c b/usr.bin/awk/main.c index c3ec30b5b41..e5705999716 100644 --- a/usr.bin/awk/main.c +++ b/usr.bin/awk/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.49 2021/11/02 15:29:41 millert Exp $ */ +/* $OpenBSD: main.c,v 1.50 2021/11/12 15:16:58 millert Exp $ */ /**************************************************************** Copyright (C) Lucent Technologies 1997 All Rights Reserved @@ -23,7 +23,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ****************************************************************/ -const char *version = "version 20211012"; +const char *version = "version 20211103"; #define DEBUG #include -- 2.20.1