[PATCH 1/2] conf: Fix mistakes in pointer usage in virDomainObjGetDefs

[Peter Krempa <pkrempa@xxxxxxxxxx>]

Coverity rightfully determined that in commit 3d021381c71221e563182f03
I made a mistake in the first check if @persDef is not NULL is
dereferencing it rather than checking.

Additionally if the vm is online the code would set @liveDef twice
rather than modifying @persDef. Fix both mistakes.
---
 src/conf/domain_conf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 77e198c..36de844 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2927,7 +2927,7 @@ virDomainObjGetDefs(virDomainObjPtr vm,
     if (liveDef)
         *liveDef = NULL;

-    if (*persDef)
+    if (persDef)
         *persDef = NULL;

     if (virDomainObjUpdateModificationImpact(vm, &flags) < 0)
@@ -2938,7 +2938,7 @@ virDomainObjGetDefs(virDomainObjPtr vm,
             *liveDef = vm->def;

         if (persDef)
-            *liveDef = vm->newDef;
+            *persDef = vm->newDef;
     } else {
         if (persDef)
             *persDef = vm->def;
-- 
2.4.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list