]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Remove VIR_STRDUP usage that sneaked in in the meantime
authorJán Tomko <jtomko@redhat.com>
Wed, 11 Dec 2019 13:00:27 +0000 (14:00 +0100)
committerJán Tomko <jtomko@redhat.com>
Thu, 12 Dec 2019 13:24:34 +0000 (14:24 +0100)
My hesitation to remove VIR_STRDUP without VIR_STRNDUP resulted
in these being able to sneak in.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/conf/backup_conf.c
src/qemu/qemu_monitor_json.c

index 6be2e0498ebb3c94e280b6a69d72f08e5a1aaa66..aa11967d2aae0888241d7935febb56362ed1d789 100644 (file)
@@ -483,9 +483,7 @@ virDomainBackupAlignDisks(virDomainBackupDefPtr def,
             continue;
 
         backupdisk = &def->disks[ndisks++];
-
-        if (VIR_STRDUP(backupdisk->name, domdisk->dst) < 0)
-            return -1;
+        backupdisk->name = g_strdup(domdisk->dst);
 
         if (backup_all &&
             !virStorageSourceIsEmpty(domdisk->src) &&
index 00e1d3ce1583ecf14e243b45305b75c467d909b8..8a8347924a51c30d9885b002cef1e7d10c9f3af0 100644 (file)
@@ -5564,8 +5564,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon,
                 goto cleanup;
             }
 
-            if (VIR_STRDUP(info->defaultCPU, tmp) < 0)
-                goto cleanup;
+            info->defaultCPU = g_strdup(tmp);
         }
     }