Module Name: src
Committed By: rillig
Date: Mon Jul 20 15:48:50 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): prefer memcmp over strncmp
To generate a diff of this commit:
cvs rdiff -u -r1.281 -r1.282 src/usr.bin/make/var.c
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.281 src/usr.bin/make/var.c:1.282
--- src/usr.bin/make/var.c:1.281 Mon Jul 20 15:44:12 2020
+++ src/usr.bin/make/var.c Mon Jul 20 15:48:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.281 2020/07/20 15:44:12 rillig Exp $ */
+/* $NetBSD: var.c,v 1.282 2020/07/20 15:48:50 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.281 2020/07/20 15:44:12 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.282 2020/07/20 15:48:50 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.281 2020/07/20 15:44:12 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.282 2020/07/20 15:48:50 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -1359,7 +1359,8 @@ VarSubstitute(GNode *ctx MAKE_ATTR_UNUSE
goto nosub;
if (args->pflags & VARP_MATCH_START) {
- if (strncmp(word, args->lhs, args->lhsLen) != 0)
+ if (wordLen < args->lhsLen ||
+ memcmp(word, args->lhs, args->lhsLen) != 0)
goto nosub;
if (args->pflags & VARP_MATCH_END) {
