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

secret: Add NULL obj check to virSecretObjListRemove

Browse Source 
Rather than have the caller check if !obj before calling, just check
in the function for !obj and return.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-04-25 09:17:22 -04:00
parent 6f8c858c74
commit 6de89f33fa
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/virsecretobj.c
View File

@ -298,6 +298,9 @@ virSecretObjListRemove(virSecretObjListPtr secrets,
{ {
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
if (!obj)
return;
virUUIDFormat(secret->def->uuid, uuidstr); virUUIDFormat(secret->def->uuid, uuidstr);
virObjectRef(secret); virObjectRef(secret);
virObjectUnlock(secret); virObjectUnlock(secret);
@ -915,7 +918,6 @@ virSecretLoad(virSecretObjListPtr secrets,
secret = NULL; secret = NULL;
cleanup: cleanup:
if (secret)
virSecretObjListRemove(secrets, secret); virSecretObjListRemove(secrets, secret);
virSecretDefFree(def); virSecretDefFree(def);
return ret; return ret;