提交 2689a922 编写于 作者: J John Ferlan

conf: Fix error path logic in virDomainObjListAddLocked

If the virHashAddEntry fails, then we need to "careful" about
how we free the @vm. When virDomainObjNew 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.

Eventually these paths should goto error and error should be changed
to use EndAPI as well, but that requires more adjustments to other
paths in the code to have a locked and ref counted @vm.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
上级 7b496447
......@@ -296,12 +296,14 @@ virDomainObjListAddLocked(virDomainObjListPtr doms,
virUUIDFormat(def->uuid, uuidstr);
if (virHashAddEntry(doms->objs, uuidstr, vm) < 0) {
virObjectUnref(vm);
virDomainObjEndAPI(&vm);
return NULL;
}
if (virHashAddEntry(doms->objsName, def->name, vm) < 0) {
virObjectRef(vm);
virHashRemoveEntry(doms->objs, uuidstr);
virDomainObjEndAPI(&vm);
return NULL;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册