From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Mon, 8 Sep 2008 22:48:17 +0000 (+0200)
Subject: fix off-by-one in pass_env_to_socket()
X-Git-Tag: 174~1576
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9d7e1b3fdd3c2bd064f33a29ea5241fdefb718ee

fix off-by-one in pass_env_to_socket()
---

diff --git a/udev/udev_rules.c b/udev/udev_rules.c
index 004a89f74..3b9631b88 100644
--- a/udev/udev_rules.c
+++ b/udev/udev_rules.c
@@ -486,10 +486,10 @@ static int pass_env_to_socket(struct udev *udev, const char *sockpath, const cha
 		saddrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]);
 	}
 
-	bufpos = snprintf(buf, sizeof(buf)-1, "%s@%s", action, devpath);
+	bufpos = snprintf(buf, sizeof(buf), "%s@%s", action, devpath);
 	bufpos++;
-	for (i = 0; environ[i] != NULL && bufpos < (sizeof(buf)-1); i++) {
-		bufpos += strlcpy(&buf[bufpos], environ[i], sizeof(buf) - bufpos-1);
+	for (i = 0; environ[i] != NULL && bufpos < (sizeof(buf)); i++) {
+		bufpos += strlcpy(&buf[bufpos], environ[i], sizeof(buf) - bufpos);
 		bufpos++;
 	}
 	if (bufpos > sizeof(buf))