Merge branch 'master' into dtdocbook

2022-01-30 08:04:32 +08:00
parent 20e32a1208 75c377065a
commit b4ffb694bd
285 changed files with 778 additions and 838 deletions
--- a/cde/programs/dthelp/parser/pass1/helptag/help.c
+++ b/cde/programs/dthelp/parser/pass1/helptag/help.c
@@ -86,7 +86,7 @@ if ((m_argc > 2) && (strchr(m_argv[2], 'f') || strchr(m_argv[2], 'F')))
 /* fills ``install'' with path to ourself */
 {
 char *path, *cp;
-char buf[200];
+char buf[BUFSIZ];
 char patbuf[BUFSIZ];
 int quit, none;

@@ -136,7 +136,7 @@ else
 	quit++;
 	else
 	*cp = '\0';
-	sprintf(buf, "%s/%s", path, m_argv[0]);
+	snprintf(buf, sizeof(buf), "%s/%s", path, m_argv[0]);

 	if (access(buf, 1) == 0)
 	    {