tools/libxl: fix leak in libxl_wait_for_backend()
authorGianni Tedesco <gianni.tedesco@citrix.com>
Tue, 17 Aug 2010 16:23:25 +0000 (17:23 +0100)
committerGianni Tedesco <gianni.tedesco@citrix.com>
Tue, 17 Aug 2010 16:23:25 +0000 (17:23 +0100)
Another leak was been introduced since the gc patch-set.

Signed-off-by: Gianni Tedesco <gianni.tedesco@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
tools/libxl/libxl_device.c

index 7a8c4fcbc42e9a75223aa802ac31bd288485d686..1fc81ce3167e42b0439ddb0c3d7497d57ce30345 100644 (file)
@@ -457,6 +457,7 @@ int libxl_wait_for_backend(libxl_ctx *ctx, char *be_path, char *state)
     unsigned int len;
     char *p;
     char *path = libxl_sprintf(&gc, "%s/state", be_path);
+    int rc = -1;
 
     while (watchdog > 0) {
         p = xs_read(ctx->xsh, XBT_NULL, path, &len);
@@ -468,10 +469,11 @@ int libxl_wait_for_backend(libxl_ctx *ctx, char *be_path, char *state)
                 XL_LOG_ERRNO(ctx, XL_LOG_ERROR, "Failed to access backend %s",
                        be_path);
             }
-            return -1;
+            goto out;
         } else {
             if (!strcmp(p, state)) {
-                return 0;
+                rc = 0;
+                goto out;
             } else {
                 usleep(100000);
                 watchdog--;
@@ -479,7 +481,8 @@ int libxl_wait_for_backend(libxl_ctx *ctx, char *be_path, char *state)
         }
     }
     XL_LOG(ctx, XL_LOG_ERROR, "Backend %s not ready", be_path);
+out:
     libxl_free_all(&gc);
-    return -1;
+    return rc;
 }