External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-05 19:29:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: report an error on OOM

Browse Source 
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...".
(cherry picked from commit 4f9af0857c1547d19610e5c59efe45a8d847b67f)
This commit is contained in:
Ján Tomko 2012-11-30 15:07:50 +01:00 committed by Cole Robinson
parent 9720cc8195
commit 0e78179d0e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nwfilter/nwfilter_driver.c
View File

@ -174,8 +174,10 @@ nwfilterDriverStartup(int 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();