Patchwork [PATCHv3,05/20] vmdk: relative_path: use pstrcpy in place of strncpy

login
register
mail settings
Submitter Jim Meyering
Date Oct. 4, 2012, 11:09 a.m.
Message ID <1349349003-15672-6-git-send-email-jim@meyering.net>
Download mbox | patch
Permalink /patch/189315/
State New
Headers show

Comments

Jim Meyering - Oct. 4, 2012, 11:09 a.m.
From: Jim Meyering <meyering@redhat.com>

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

Acked-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 block/vmdk.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch

diff --git a/block/vmdk.c b/block/vmdk.c
index f2e861b..1a80e5a 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]) {