mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
interface: Consume @def in virInterfaceObjNew
Move the consumption of @def in virInterfaceObjNew and then handle that in the error path of virInterfaceObjListAssignDef since it's caller expects to need to free @def when NULL is returned and so would virInterfaceObjFree. Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
parent
309947375a
commit
92840eb3a7
@ -47,7 +47,7 @@ struct _virInterfaceObjList {
|
||||
/* virInterfaceObj manipulation */
|
||||
|
||||
static virInterfaceObjPtr
|
||||
virInterfaceObjNew(void)
|
||||
virInterfaceObjNew(virInterfaceDefPtr def)
|
||||
{
|
||||
virInterfaceObjPtr obj;
|
||||
|
||||
@ -62,6 +62,7 @@ virInterfaceObjNew(void)
|
||||
}
|
||||
|
||||
virInterfaceObjLock(obj);
|
||||
obj->def = def;
|
||||
|
||||
return obj;
|
||||
}
|
||||
@ -251,17 +252,17 @@ virInterfaceObjListAssignDef(virInterfaceObjListPtr interfaces,
|
||||
return obj;
|
||||
}
|
||||
|
||||
if (!(obj = virInterfaceObjNew()))
|
||||
if (!(obj = virInterfaceObjNew(def)))
|
||||
return NULL;
|
||||
|
||||
if (VIR_APPEND_ELEMENT_COPY(interfaces->objs,
|
||||
interfaces->count, obj) < 0) {
|
||||
obj->def = NULL;
|
||||
virInterfaceObjUnlock(obj);
|
||||
virInterfaceObjFree(obj);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
obj->def = def;
|
||||
return obj;
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user