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

parallels: fix possible crash in case of errors in prlsdkLoadDomain

Browse Source 
Cleanup code in prlsdkLoadDomain doesn't take into account the fact
if private domain structure along with freeing function is assigned
or not. In case it is, we shouldn't call it manually because
virDomainObjListRemove calls it and frees pdom.
Also, allocated def structure should be freed only if it's not
assigned to domain. Otherwise it will be called twice: one time by
virDomainObjListRemove and the second by prlsdkLoadDomain itself.

Signed-off-by: Maxim Nestratov <mnestratov@parallels.com>
This commit is contained in:
Maxim Nestratov 2015-05-21 16:49:35 +03:00 committed by Dmitry Guryanov
parent dc58e7424a
commit 55714f78c4
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/parallels/parallels_sdk.c
View File

@ -1379,10 +1379,21 @@ prlsdkLoadDomain(parallelsConnPtr privconn,
return dom;
error:
if (dom && !olddom)
if (dom && !olddom) {
/* Domain isn't persistent means that we haven't yet set
* prlsdkDomObjFreePrivate and should call it manually
*/
if (!dom->persistent)
prlsdkDomObjFreePrivate(pdom);
virDomainObjListRemove(privconn->domains, dom);
virDomainDefFree(def);
prlsdkDomObjFreePrivate(pdom);
}
/* Delete newly allocated def only if we haven't assigned it to domain
* Otherwise we will end up with domain having invalid def within it
*/
if (!dom)
virDomainDefFree(def);
return NULL;
}