util: Fix leak in virStringTrimOptionalNewline

Do not access any data if strlen() == 0.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/util/virstring.c b/src/util/virstring.c
index eac4774b533ea20c9ffd122cf2ecbd6369335b83..b2ebce27ff499bac13a97800c61e87a2bab0f67a 100644 (file)
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -1394,9 +1394,13 @@ virStringEncodeBase64(const uint8_t *buf, size_t buflen)
  */
 void virStringTrimOptionalNewline(char *str)
 {
-    char *tmp = str + strlen(str) - 1;
-    if (*tmp == '\n')
-        *tmp = '\0';
+    size_t len = strlen(str);
+
+    if (!len)
+        return;
+
+    if (str[len - 1] == '\n')
+        str[len - 1] = '\0';
 }