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

conf: Fix error path logic in virDomainObjListLoadStatus 

If the virHashAddEntry fails, then we need to "careful" about
how we free the @obj. When virDomainObjParseFile returns there
is one reference and the object is locked, so use virDomainObjEndAPI
when done.

Add a virObjectRef in the error path for the second virHashAddEntry
call since it doesn't call virObjectRef, but virHashRemoveEntry
will call virObjectUnref because virObjectFreeHashData is called
when the element is removed from the hash table as set up in
virDomainObjListNew.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2018-03-26 19:14:30 -04:00
parent 2689a922aa
commit e0f7707cd5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf/virdomainobjlist.c
View File

@ -536,6 +536,7 @@ virDomainObjListLoadStatus(virDomainObjListPtr doms,
goto error;
if (virHashAddEntry(doms->objsName, obj->def->name, obj) < 0) {
virObjectRef(obj);
virHashRemoveEntry(doms->objs, uuidstr);
goto error;
}
@ -551,7 +552,7 @@ virDomainObjListLoadStatus(virDomainObjListPtr doms,
return obj;
error:
virObjectUnref(obj);
virDomainObjEndAPI(&obj);
VIR_FREE(statusFile);
return NULL;
}