[Xen-changelog] [xen master] libxl: fix an error path that uses uninitialised rc in libxl_set_memory_target

[patchbot@xxxxxxx]

commit 0630892fafe87ff5e3b65422d38158de46db3ed0
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Sun Jun 12 15:09:50 2016 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Mon Jun 20 14:47:02 2016 +0100

    libxl: fix an error path that uses uninitialised rc in 
libxl_set_memory_target
    
    ecdc6fd8 ("libxl: Fix libxl_set_memory_target return value") failed to
    initialised rc in one failure path. Fix it in this patch.
    
    Also fixed an indentation issue while I was there.
    
    CID: 1362695
    
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/libxl/libxl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 5ec4c80..1c81239 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -4927,10 +4927,12 @@ retry_transaction:
 
     target = libxl__xs_read(gc, t, GCSPRINTF("%s/memory/target", dompath));
     if (!target && !domid) {
-        if (!xs_transaction_end(ctx->xsh, t, 1))
+        if (!xs_transaction_end(ctx->xsh, t, 1)) {
+            rc = ERROR_FAIL;
             goto out_no_transaction;
+        }
         lrc = libxl__fill_dom0_memory_info(gc, &current_target_memkb,
-                                          &current_max_memkb);
+                                           &current_max_memkb);
         if (lrc < 0) { rc = ERROR_FAIL; goto out_no_transaction; }
         goto retry_transaction;
     } else if (!target) {
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog