mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-27 07:22:07 +03:00
nwfilter: report an error on OOM
Also removed some unreachable code found by coverity: libvirt-0.10.2/src/nwfilter/nwfilter_driver.c:259: unreachable: This code cannot be reached: "nwfilterDriverUnlock(driver...".
This commit is contained in:
parent
e9d74a7a82
commit
4f9af0857c
@ -174,8 +174,10 @@ nwfilterDriverStartup(bool privileged)
|
||||
sysbus = virDBusGetSystemBus();
|
||||
#endif /* HAVE_DBUS */
|
||||
|
||||
if (VIR_ALLOC(driverState) < 0)
|
||||
goto alloc_err_exit;
|
||||
if (VIR_ALLOC(driverState) < 0) {
|
||||
virReportOOMError();
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (virMutexInit(&driverState->lock) < 0)
|
||||
goto err_free_driverstate;
|
||||
@ -247,11 +249,8 @@ error:
|
||||
nwfilterDriverUnlock(driverState);
|
||||
nwfilterDriverShutdown();
|
||||
|
||||
alloc_err_exit:
|
||||
return -1;
|
||||
|
||||
nwfilterDriverUnlock(driverState);
|
||||
|
||||
err_techdrivers_shutdown:
|
||||
virNWFilterTechDriversShutdown();
|
||||
virNWFilterDHCPSnoopShutdown();
|
||||
|
Loading…
Reference in New Issue
Block a user