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

node: Don't return invalid pointers 

Commit 4337bc57be introduced code that would in certain error paths
unref the last reference of a pointer, but return it.

Clear the pointers before returning them.
This commit is contained in:
Peter Krempa 2017-05-26 12:57:43 +02:00
parent d190424105
commit 8238fd6624
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/node_device/node_device_driver.c
View File

@ -241,8 +241,10 @@ nodeDeviceLookupByName(virConnectPtr conn, const char *name)
goto cleanup;
if ((ret = virGetNodeDevice(conn, name))) {
if (VIR_STRDUP(ret->parent, obj->def->parent) < 0)
if (VIR_STRDUP(ret->parent, obj->def->parent) < 0) {
virObjectUnref(ret);
ret = NULL;
}
}
cleanup:
@ -285,8 +287,10 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
goto out;
if ((dev = virGetNodeDevice(conn, obj->def->name))) {
if (VIR_STRDUP(dev->parent, obj->def->parent) < 0)
if (VIR_STRDUP(dev->parent, obj->def->parent) < 0) {
virObjectUnref(dev);
dev = NULL;
}
}
virNodeDeviceObjUnlock(obj);
goto out;

4
src/test/test_driver.c
View File

@ -5331,8 +5331,10 @@ testNodeDeviceLookupByName(virConnectPtr conn, const char *name)
goto cleanup;
if ((ret = virGetNodeDevice(conn, name))) {
if (VIR_STRDUP(ret->parent, obj->def->parent) < 0)
if (VIR_STRDUP(ret->parent, obj->def->parent) < 0) {
virObjectUnref(ret);
ret = NULL;
}
}
cleanup: