External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "nwfilter: Move save of config until after successful assign"

Browse Source 
This reverts commit b3e71a8830b2683ee88fa10cb048eabb99a446c0.

As it turns out this ends up very badly as the @def could be Free'd
even though it's owned by @obj as a result of the AssignDef.
This commit is contained in:
John Ferlan 2017-07-15 08:23:42 -04:00
parent 3c3c3e3613
commit dff020c91d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/virnwfilterobj.c
View File

@ -524,14 +524,14 @@ virNWFilterObjListLoadConfig(virNWFilterObjListPtr nwfilters,
goto error; goto error;
} }
if (!(obj = virNWFilterObjListAssignDef(nwfilters, def)))
goto error;
/* We generated a UUID, make it permanent by saving the config to disk */ /* We generated a UUID, make it permanent by saving the config to disk */
if (!def->uuid_specified && if (!def->uuid_specified &&
virNWFilterSaveConfig(configDir, def) < 0) virNWFilterSaveConfig(configDir, def) < 0)
goto error; goto error;
if (!(obj = virNWFilterObjListAssignDef(nwfilters, def)))
goto error;
VIR_FREE(configFile); VIR_FREE(configFile);
return obj; return obj;