From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 2 Mar 2021 12:41:22 +0000 (+0100)
Subject: xenParseXLChannel: Use g_strndup instead of virStrncpy
X-Git-Tag: v7.2.0-rc1~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd1728e9699c45187d2f16a9c88ba36f9da252ff;p=thirdparty%2Flibvirt.git

xenParseXLChannel: Use g_strndup instead of virStrncpy

Make the temporary string an autofree-ing pointer and copy the contents.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index 4113be8cd1..9b2a2fe292 100644
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -1070,7 +1070,7 @@ xenParseXLChannel(virConfPtr conf, virDomainDefPtr def)
     if (list && list->type == VIR_CONF_LIST) {
         list = list->list;
         while (list) {
-            char type[10];
+            g_autofree char *type = NULL;
             char *key;
 
             if ((list->type != VIR_CONF_STRING) || (list->str == NULL))
@@ -1087,11 +1087,8 @@ xenParseXLChannel(virConfPtr conf, virDomainDefPtr def)
 
                 if (STRPREFIX(key, "connection=")) {
                     int len = nextkey ? (nextkey - data) : strlen(data);
-                    if (virStrncpy(type, data, len, sizeof(type)) < 0) {
-                        virReportError(VIR_ERR_INTERNAL_ERROR,
-                                       _("connection %s too big"), data);
-                        goto skipchannel;
-                    }
+                    g_clear_pointer(&type, g_free);
+                    type = g_strndup(data, len);
                 } else if (STRPREFIX(key, "name=")) {
                     int len = nextkey ? (nextkey - data) : strlen(data);
                     VIR_FREE(name);