From 102eb00c28e5edd697d012716a6b9c40200c8ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Mon, 16 Sep 2013 13:26:46 +0200 Subject: [PATCH] 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) --- src/qemu/qemu_migration.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 69a9013e06..d7b89fccb4 100644 --- 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);