NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virdomainjob: add check for callbacks

Browse Source 
There may be a case that the callback structure will exist with
no callbacks (following patches). This patch adds check for
specific callbacks before using them.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Kristina Hanicova 2022-09-05 15:57:02 +02:00 committed by Ján Tomko
parent 2378f9d86e
commit 0c3f023045
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/virdomainjob.c
View File

@ -138,7 +138,7 @@ virDomainObjInitJob(virDomainJobObj *job,
return -1; return -1;
} }
if (job->cb && if (job->cb && job->cb->allocJobPrivate &&
!(job->privateData = job->cb->allocJobPrivate())) { !(job->privateData = job->cb->allocJobPrivate())) {
virCondDestroy(&job->cond); virCondDestroy(&job->cond);
virCondDestroy(&job->asyncCond); virCondDestroy(&job->asyncCond);
@ -180,7 +180,7 @@ virDomainObjResetAsyncJob(virDomainJobObj *job)
g_clear_pointer(&job->current, virDomainJobDataFree); g_clear_pointer(&job->current, virDomainJobDataFree);
job->apiFlags = 0; job->apiFlags = 0;
if (job->cb) if (job->cb && job->cb->resetJobPrivate)
job->cb->resetJobPrivate(job->privateData); job->cb->resetJobPrivate(job->privateData);
} }
@ -206,7 +206,7 @@ virDomainObjPreserveJob(virDomainJobObj *currJob,
job->privateData = g_steal_pointer(&currJob->privateData); job->privateData = g_steal_pointer(&currJob->privateData);
job->apiFlags = currJob->apiFlags; job->apiFlags = currJob->apiFlags;
if (currJob->cb && if (currJob->cb && currJob->cb->allocJobPrivate &&
!(currJob->privateData = currJob->cb->allocJobPrivate())) !(currJob->privateData = currJob->cb->allocJobPrivate()))
return -1; return -1;
job->cb = currJob->cb; job->cb = currJob->cb;
@ -226,7 +226,7 @@ virDomainObjClearJob(virDomainJobObj *job)
virCondDestroy(&job->cond); virCondDestroy(&job->cond);
virCondDestroy(&job->asyncCond); virCondDestroy(&job->asyncCond);
if (job->cb) if (job->cb && job->cb->freeJobPrivate)
g_clear_pointer(&job->privateData, job->cb->freeJobPrivate); g_clear_pointer(&job->privateData, job->cb->freeJobPrivate);
} }