From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Tue, 1 Apr 2003 15:02:49 +0000 (+0000)
Subject: fix strlcpy() rval check (innocuous)
X-Git-Tag: SUDO_1_6_8~360
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=632dbebef07b2fe24784b2bd16b8c839ac913cdb;p=sudo

fix strlcpy() rval check (innocuous)
---

diff --git a/sudo.c b/sudo.c
index e5863de1b..1c56960c8 100644
--- a/sudo.c
+++ b/sudo.c
@@ -613,7 +613,7 @@ init_vars(sudo_mode)
 	    user_args = (char *) emalloc(size);
 	    for (to = user_args, from = NewArgv + 1; *from; from++) {
 		n = strlcpy(to, *from, size - (to - user_args));
-		if (n >= size) {
+		if (n >= size - (to - user_args)) {
 		    (void) fprintf(stderr,
 			"%s: internal error, init_vars() overflow\n", Argv[0]);
 		    exit(1);
diff --git a/testsudoers.c b/testsudoers.c
index f9d59be82..79cfa12cd 100644
--- a/testsudoers.c
+++ b/testsudoers.c
@@ -385,7 +385,7 @@ main(argc, argv)
 	user_args = (char *) emalloc(size);
 	for (to = user_args, from = NewArgv + 1; *from; from++) {
 	    n = strlcpy(to, *from, size - (to - user_args));
-	    if (n >= size) {
+	    if (n >= size - (to - user_args)) {
 		(void) fprintf(stderr,
 		    "%s: internal error, init_vars() overflow\n", Argv[0]);
 		exit(1);