From: David Zeuthen <davidz@redhat.com>
Date: Tue, 2 Mar 2010 22:06:33 +0000 (-0500)
Subject: Decrease buffer size when advancing past NUL byte
X-Git-Tag: 174~605
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ecd42de2c56b4fcf0069b8b4a4d6607710e5de61;ds=inline

Decrease buffer size when advancing past NUL byte

Otherwise we'll overflow the buffer if space is tight. Also add a comment explaining this.

Signed-off-by: David Zeuthen <davidz@redhat.com>
---

diff --git a/libudev/libudev-device.c b/libudev/libudev-device.c
index 71fc77524..4f42aa281 100644
--- a/libudev/libudev-device.c
+++ b/libudev/libudev-device.c
@@ -1166,7 +1166,9 @@ static int update_envp_monitor_buf(struct udev_device *udev_device)
 		l = util_strpcpyl(&s, l, key, "=", udev_list_entry_get_value(list_entry), NULL);
 		if (l == 0)
 			return -EINVAL;
+		/* advance past the trailing '\0' that util_strpcpyl() guarantees */
 		s++;
+		l--;
 	}
 	udev_device->envp[i] = NULL;
 	udev_device->monitor_buf_len = s - udev_device->monitor_buf;