From: Jim Meyering <meyering@redhat.com>
Date: Thu, 4 Oct 2012 11:09:48 +0000 (+0200)
Subject: vmdk: relative_path: use pstrcpy in place of strncpy
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d66f8e7bd3de4a2ecf0680c635f870f2138425b8;p=qemu.git

vmdk: relative_path: use pstrcpy in place of strncpy

Avoid strncpy+manual-NUL-terminate.  Use pstrcpy instead.

Acked-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/block/vmdk.c b/block/vmdk.c
index f2e861b074..1a80e5a247 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -1408,8 +1408,7 @@ static int relative_path(char *dest, int dest_size,
         return -1;
     }
     if (path_is_absolute(target)) {
-        dest[dest_size - 1] = '\0';
-        strncpy(dest, target, dest_size - 1);
+        pstrcpy(dest, dest_size, target);
         return 0;
     }
     while (base[i] == target[i]) {