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

libxl: Fix double-dispose of libxl domain config 

libxlBuildDomainConfig() was disposing the libxl_domain_config object
on error, only to have it disposed again by libxlBuildDomainConfig()'s
caller, which resulted in a segfault.  Leave disposing of the config
object to it's owner.
This commit is contained in:
Jim Fehlig 2013-04-29 17:04:55 -06:00
parent e0eb672e00
commit 80f01915b5
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libxl/libxl_conf.c
View File

@ -796,19 +796,19 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver,
return -1; return -1;
if (libxlMakeDomBuildInfo(def, d_config) < 0) { if (libxlMakeDomBuildInfo(def, d_config) < 0) {
goto error; return -1;
} }
if (libxlMakeDiskList(def, d_config) < 0) { if (libxlMakeDiskList(def, d_config) < 0) {
goto error; return -1;
} }
if (libxlMakeNicList(def, d_config) < 0) { if (libxlMakeNicList(def, d_config) < 0) {
goto error; return -1;
} }
if (libxlMakeVfbList(driver, def, d_config) < 0) { if (libxlMakeVfbList(driver, def, d_config) < 0) {
goto error; return -1;
} }
d_config->on_reboot = def->onReboot; d_config->on_reboot = def->onReboot;
@ -816,8 +816,4 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver,
d_config->on_crash = def->onCrash; d_config->on_crash = def->onCrash;
return 0; return 0;
error:
libxl_domain_config_dispose(d_config);
return -1;
} }