From: John Ferlan <jferlan@redhat.com>
Date: Fri, 18 Jan 2013 13:50:37 +0000 (-0500)
Subject: locking: use virStrcpyStatic instead of memcpy
X-Git-Tag: v1.0.2-rc2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=678e891380019b353b1d30551d97ceccfaa3aecc;p=thirdparty%2Flibvirt.git

locking: use virStrcpyStatic instead of memcpy
---

diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index 0b7c6d5eda..95f7d61827 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -206,7 +206,14 @@ static int virLockManagerSanlockSetupLockspace(void)
         goto error;
     }
 
-    memcpy(ls.name, VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE, SANLK_NAME_LEN);
+    if (!virStrcpyStatic(ls.name,
+                         VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE)) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Lockspace path '%s' exceeded %d characters"),
+                       VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE,
+                       SANLK_PATH_LEN);
+        goto error;
+    }
     ls.host_id = 0; /* Doesn't matter for initialization */
     ls.flags = 0;
     if (!virStrcpy(ls.host_id_disk.path, path, SANLK_PATH_LEN)) {