Fix compilation on systems without a native strlcpy() function.

sudo-project · Jan 28, 2021 · 8ca47cc · 8ca47cc
1 parent dceab7d
commit 8ca47cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/plugins/sudoers/strvec_join.c b/plugins/sudoers/strvec_join.c
@@ -29,9 +29,15 @@
 
 #include "sudoers.h"
 
+#ifdef HAVE_STRLCPY
+# define cpy_default	strlcpy
+#else
+# define cpy_default	sudo_strlcpy
+#endif
+
 /*
  * Join a NULL-terminated array of strings using the specified separator
- * character.  The copy function must have strlcpy-like semantics.
+ * char.  If non-NULL, the copy function must have strlcpy-like semantics.
  */
 char *
 strvec_join(char *const argv[], char sep, size_t (*cpy)(char *, const char *, size_t))
@@ -48,6 +54,8 @@ strvec_join(char *const argv[], char sep, size_t (*cpy)(char *, const char *, si
 	debug_return_ptr(NULL);
     }
 
+    if (cpy == NULL)
+	cpy = cpy_default;
     for (dst = result, av = argv; *av != NULL; av++) {
 	n = cpy(dst, *av, size);
 	if (n >= size) {

diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
@@ -960,7 +960,7 @@ set_cmnd(void)
 		 */
 		user_args = strvec_join(NewArgv + 1, ' ', strlcpy_unescape);
 	    } else {
-		user_args = strvec_join(NewArgv + 1, ' ', strlcpy);
+		user_args = strvec_join(NewArgv + 1, ' ', NULL);
 	    }
 	    if (user_args == NULL)
 		debug_return_int(NOT_FOUND_ERROR);