[PATCH v2 1/2] virTypedParamsSerialize: set remote_params_len at the end

[Marc Hartmayer <mhartmay@xxxxxxxxxxxxx>]

From: Marc Hartmayer <mhartmay@xxxxxxxxxxxxxxxxxx>

Update the length @remote_params_len only if the related
@remote_params_val has also been set.

Signed-off-by: Marc Hartmayer <mhartmay@xxxxxxxxxxxxx>
---
 src/util/virtypedparam.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index 2452628cdbcd..c5fc68418c35 100644
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -1501,8 +1501,8 @@ virTypedParamsSerialize(virTypedParameterPtr params,
     size_t j;
     int rv = -1;
     virTypedParameterRemotePtr params_val;
+    int params_len = nparams;
 
-    *remote_params_len = nparams;
     if (VIR_ALLOC_N(params_val, nparams) < 0)
         goto cleanup;
 
@@ -1515,7 +1515,7 @@ virTypedParamsSerialize(virTypedParameterPtr params,
         if (!param->type ||
             (!(flags & VIR_TYPED_PARAM_STRING_OKAY) &&
              param->type == VIR_TYPED_PARAM_STRING)) {
-            --*remote_params_len;
+            --params_len;
             continue;
         }
 
@@ -1556,6 +1556,7 @@ virTypedParamsSerialize(virTypedParameterPtr params,
     }
 
     *remote_params_val = params_val;
+    *remote_params_len = params_len;
     params_val = NULL;
     rv = 0;
 
-- 
2.13.4

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