From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Mon, 16 Sep 2019 13:55:36 +0000 (+0300)
Subject: virStrncpy: fix to successfully copy empty string
X-Git-Tag: v5.8.0-rc1~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd9cbeffe974f4fcd4d87b8a81afdeb1485a2eea;p=thirdparty%2Flibvirt.git

virStrncpy: fix to successfully copy empty string

After [1] we got failure on attempt to copy empty string.
Before the patch empty string was copied successfuly.
Restore the original behaviour.

[1] 7d70a63b util: Improve virStrncpy() implementation

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/util/virstring.c b/src/util/virstring.c
index 2064944b0b..a4cc7e9c0a 100644
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -786,7 +786,7 @@ virStrncpy(char *dest, const char *src, size_t n, size_t destbytes)
     if (n == -1)
         n = src_len;
 
-    if (n <= 0 || n > src_len || n > (destbytes - 1))
+    if (n > src_len || n > (destbytes - 1))
         return -1;
 
     memcpy(dest, src, n);