]> xenbits.xensource.com Git - osstest/qemu.git/commitdiff
qga: Fix handle fd leak in acquire_privilege()
authorGonglei <arei.gonglei@huawei.com>
Mon, 19 May 2014 07:26:03 +0000 (15:26 +0800)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Tue, 3 Jun 2014 20:07:59 +0000 (15:07 -0500)
token should be closed in all conditions.
So move CloseHandle(token) to "out" branch.

Signed-off-by: Wang Rui <moon.wangrui@huawei.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
qga/commands-win32.c

index d793dd0c8565f2d906fa420dd869584d6269e2a3..e76939651a08ddef92f5124b9423758fc3cafea7 100644 (file)
@@ -31,7 +31,7 @@
 
 static void acquire_privilege(const char *name, Error **errp)
 {
-    HANDLE token;
+    HANDLE token = NULL;
     TOKEN_PRIVILEGES priv;
     Error *local_err = NULL;
 
@@ -53,13 +53,15 @@ static void acquire_privilege(const char *name, Error **errp)
             goto out;
         }
 
-        CloseHandle(token);
     } else {
         error_set(&local_err, QERR_QGA_COMMAND_FAILED,
                   "failed to open privilege token");
     }
 
 out:
+    if (token) {
+        CloseHandle(token);
+    }
     if (local_err) {
         error_propagate(errp, local_err);
     }