Module Name: src
Committed By: rillig
Date: Fri Jul 31 13:30:09 UTC 2020
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: moderrs.exp moderrs.mk
Log Message:
make(1): fix undefined behavior when parsing malformed :C modifier
Same as in the :S modifier.
To generate a diff of this commit:
cvs rdiff -u -r1.359 -r1.360 src/usr.bin/make/var.c
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/moderrs.exp
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/moderrs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.359 src/usr.bin/make/var.c:1.360
--- src/usr.bin/make/var.c:1.359 Fri Jul 31 07:29:21 2020
+++ src/usr.bin/make/var.c Fri Jul 31 13:30:09 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.359 2020/07/31 07:29:21 rillig Exp $ */
+/* $NetBSD: var.c,v 1.360 2020/07/31 13:30:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.359 2020/07/31 07:29:21 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.360 2020/07/31 13:30:09 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.359 2020/07/31 07:29:21 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.360 2020/07/31 13:30:09 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -2468,6 +2468,11 @@ ApplyModifier_Regex(const char *mod, App
args.pflags = 0;
Boolean oneBigWord = st->oneBigWord;
char delim = mod[1];
+ if (delim == '\0') {
+ Error("Missing delimiter for :C modifier");
+ st->next = mod + 1;
+ return AMR_CLEANUP;
+ }
st->next = mod + 2;
Index: src/usr.bin/make/unit-tests/moderrs.exp
diff -u src/usr.bin/make/unit-tests/moderrs.exp:1.10 src/usr.bin/make/unit-tests/moderrs.exp:1.11
--- src/usr.bin/make/unit-tests/moderrs.exp:1.10 Fri Jul 31 07:29:21 2020
+++ src/usr.bin/make/unit-tests/moderrs.exp Fri Jul 31 13:30:09 2020
@@ -63,9 +63,8 @@ make: Unclosed variable specification (e
TheVariable
TheVariable
mod-regex-delimiter:
-make: RE substitution error: (details omitted)
-make: Unclosed substitution for VAR (, missing)
-echo
+make: Missing delimiter for :C modifier
+
make: Unclosed substitution for VAR (, missing)
make: Unclosed substitution for VAR (, missing)
@@ -77,7 +76,7 @@ make: Unclosed substitution for VAR (, m
make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier C
TheVariable
TheVariable
-make: RE substitution error: (details omitted)
+make: Missing delimiter for :C modifier
1:
make: Unclosed substitution for VAR (, missing)
2:
Index: src/usr.bin/make/unit-tests/moderrs.mk
diff -u src/usr.bin/make/unit-tests/moderrs.mk:1.8 src/usr.bin/make/unit-tests/moderrs.mk:1.9
--- src/usr.bin/make/unit-tests/moderrs.mk:1.8 Wed Jul 29 20:33:38 2020
+++ src/usr.bin/make/unit-tests/moderrs.mk Fri Jul 31 13:30:09 2020
@@ -1,4 +1,4 @@
-# $Id: moderrs.mk,v 1.8 2020/07/29 20:33:38 rillig Exp $
+# $Id: moderrs.mk,v 1.9 2020/07/31 13:30:09 rillig Exp $
#
# various modifier error tests
@@ -109,7 +109,6 @@ mod-subst-delimiter:
@echo ${VAR:S,from,to,
@echo ${VAR:S,from,to,}
-# XXX: Where does the "echo" in the output of "${VAR:C" come from?
mod-regex-delimiter:
@echo $@:
@echo ${VAR:C
