openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

conf: use g_strdup in virDomainDiskSet 

Use a temporary variable to allow copying from the
currently set source.

Always return 0 since none of the callers distinguishes
between 0 and 1 propagated from VIR_STRDUP.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2019-10-19 18:41:29 +02:00
parent cb756a9914
commit d74067c07b
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/conf/domain_conf.c
View File

@ -2139,15 +2139,10 @@ virDomainDiskGetSource(virDomainDiskDef const *def)
int
virDomainDiskSetSource(virDomainDiskDefPtr def, const char *src)
{
int ret;
char *tmp = def->src->path;
ret = VIR_STRDUP(def->src->path, src);
if (ret < 0)
def->src->path = tmp;
else
VIR_FREE(tmp);
return ret;
char *tmp = g_strdup(src);
g_free(def->src->path);
def->src->path = tmp;
return 0;
}
@ -2174,15 +2169,10 @@ virDomainDiskGetDriver(const virDomainDiskDef *def)
int
virDomainDiskSetDriver(virDomainDiskDefPtr def, const char *name)
{
int ret;
char *tmp = def->driverName;
ret = VIR_STRDUP(def->driverName, name);
if (ret < 0)
def->driverName = tmp;
else
VIR_FREE(tmp);
return ret;
char *tmp = g_strdup(name);
g_free(def->driverName);
def->driverName = tmp;
return 0;
}