Module Name: src
Committed By: fox
Date: Wed Feb 5 20:11:54 UTC 2020
Modified Files:
src/games/battlestar: parse.c
Log Message:
games/battlestar: Fix the -Werror=restrict warning.
Replace strcpy(1) with the safer snprintf(3) which guarantees NULL
termination of strings.
Error was reported when build.sh was run with MKLIBCSANITIZER=yes flag.
Reviewed by: kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/games/battlestar/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/battlestar/parse.c
diff -u src/games/battlestar/parse.c:1.15 src/games/battlestar/parse.c:1.16
--- src/games/battlestar/parse.c:1.15 Fri Jul 1 06:04:54 2005
+++ src/games/battlestar/parse.c Wed Feb 5 20:11:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.15 2005/07/01 06:04:54 jmc Exp $ */
+/* $NetBSD: parse.c,v 1.16 2020/02/05 20:11:54 fox Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)parse.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: parse.c,v 1.15 2005/07/01 06:04:54 jmc Exp $");
+__RCSID("$NetBSD: parse.c,v 1.16 2020/02/05 20:11:54 fox Exp $");
#endif
#endif /* not lint */
@@ -120,7 +120,7 @@ parse(void)
for (i = n + 1; i < wordcount; i++) {
wordtype[i - 1] = wordtype[i];
wordvalue[i - 1] = wordvalue[i];
- strcpy(words[i - 1], words[i]);
+ snprintf(words[i - 1], WORDLEN, "%s", words[i]);
}
wordcount--;
}
@@ -140,7 +140,7 @@ parse(void)
for (i = n + 1; i < wordcount; i++) {
wordtype[i - 1] = wordtype[i];
wordvalue[i - 1] = wordvalue[i];
- strcpy(words[i - 1], words[i]);
+ snprintf(words[i - 1], WORDLEN, "%s", words[i]);
}
wordcount--;
}
@@ -164,7 +164,7 @@ parse(void)
wordtype[n + 1] = wordtype[n - 1];
wordtype[n - 1] = OBJECT;
strcpy(tmpword, words[n - 1]);
- strcpy(words[n - 1], words[n + 1]);
+ snprintf(words[n - 1], WORDLEN, "%s", words[n + 1]);
strcpy(words[n + 1], tmpword);
flag = 1;
}
@@ -177,7 +177,7 @@ parse(void)
for (i = n + 1; i < wordcount; i++) {
wordtype[i - 1] = wordtype[i + 1];
wordvalue[i - 1] = wordvalue[i + 1];
- strcpy(words[i - 1], words[i + 1]);
+ snprintf(words[i - 1], WORDLEN, "%s", words[i + 1]);
}
wordcount--;
wordcount--;
