libxc: Fix gcc 4.3 build failure
authorKeir Fraser <keir.fraser@citrix.com>
Tue, 9 Dec 2008 12:42:18 +0000 (12:42 +0000)
committerKeir Fraser <keir.fraser@citrix.com>
Tue, 9 Dec 2008 12:42:18 +0000 (12:42 +0000)
Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
tools/libxc/xc_dom_x86.c

index f96ec3f7ab1682973770b1379ad65757ee90fc35..9306636ba8c7bc6294e5a75e4d7b662c703c0ad2 100644 (file)
@@ -418,7 +418,8 @@ static int start_info_x86_32(struct xc_dom_image *dom)
     xc_dom_printf("%s: called\n", __FUNCTION__);
 
     memset(start_info, 0, sizeof(*start_info));
-    snprintf(start_info->magic, sizeof(start_info->magic), dom->guest_type);
+    strncpy(start_info->magic, dom->guest_type, sizeof(start_info->magic));
+    start_info->magic[sizeof(start_info->magic) - 1] = '\0';
     start_info->nr_pages = dom->total_pages;
     start_info->shared_info = shinfo << PAGE_SHIFT_X86;
     start_info->pt_base = dom->pgtables_seg.vstart;
@@ -457,7 +458,8 @@ static int start_info_x86_64(struct xc_dom_image *dom)
     xc_dom_printf("%s: called\n", __FUNCTION__);
 
     memset(start_info, 0, sizeof(*start_info));
-    snprintf(start_info->magic, sizeof(start_info->magic), dom->guest_type);
+    strncpy(start_info->magic, dom->guest_type, sizeof(start_info->magic));
+    start_info->magic[sizeof(start_info->magic) - 1] = '\0';
     start_info->nr_pages = dom->total_pages;
     start_info->shared_info = shinfo << PAGE_SHIFT_X86;
     start_info->pt_base = dom->pgtables_seg.vstart;