From: Karel Zak <kzak@redhat.com>
Date: Thu, 6 Jun 2019 09:09:17 +0000 (+0200)
Subject: lib/path: make sure ul_path_read_buffer() derminate result
X-Git-Tag: v2.35-rc1~328^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3188dd90a4cd51723fefdcea8c3b82a6e7afc29;p=thirdparty%2Futil-linux.git

lib/path: make sure ul_path_read_buffer() derminate result

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/lib/path.c b/lib/path.c
index f7fd195924..8dce1da408 100644
--- a/lib/path.c
+++ b/lib/path.c
@@ -610,9 +610,10 @@ int ul_path_read_buffer(struct path_cxt *pc, char *buf, size_t bufsz, const char
 
 	/* Remove tailing newline (usual in sysfs) */
 	if (rc > 0 && *(buf + rc - 1) == '\n')
-		--rc;
+		buf[--rc] = '\0';
+	else
+		buf[rc - 1] = '\0';
 
-	buf[rc] = '\0';
 	return rc;
 }