Always free network and graphics cookies

qemuMigrationEatCookie has flags to control if these should
be parsed, but it does not fill mig->flags. These cookies might
get leaked if these flags are not set by qemuMigrationBakeCookie.

42 (32 direct, 10 indirect) bytes in 1 blocks are definitely lost in
loss record 361 of 662
==123== by 0x1BA33FCA: qemuMigrationEatCookie (qemu_migration.c:678)
==123== by 0x1BA34A1E: qemuMigrationRun (qemu_migration.c:3108)
==123== by 0x1BA3622B: doNativeMigrate (qemu_migration.c:3343)
==123== by 0x1BA3B408: qemuMigrationPerform (qemu_migration.c:4138)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 69a9013e062dffa4d179a8743661f0a72f6258a4..d7b89fccb40a9f576b801099059c94b77a34a10f 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -202,11 +202,8 @@ static void qemuMigrationCookieFree(qemuMigrationCookiePtr mig)
     if (!mig)
         return;
 
-    if (mig->flags & QEMU_MIGRATION_COOKIE_GRAPHICS)
-        qemuMigrationCookieGraphicsFree(mig->graphics);
-
-    if (mig->flags & QEMU_MIGRATION_COOKIE_NETWORK)
-        qemuMigrationCookieNetworkFree(mig->network);
+    qemuMigrationCookieGraphicsFree(mig->graphics);
+    qemuMigrationCookieNetworkFree(mig->network);
 
     VIR_FREE(mig->localHostname);
     VIR_FREE(mig->remoteHostname);