From nobody Sun Feb 8 13:11:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601850260; cv=none; d=zohomail.com; s=zohoarc; b=LB/Fb0+Cl8248jgcAQHRorwoLXbAFpOBKOa4jiccqd5WypLiZHYDYLF4HKDlCgjem4i+Q95zwnSS9u4feb3QHBmVJvB+IeJfxSvYcY3xGeKr0hqjgMBgGfvvUMKzCoCWNzIRwVDzThvlx3tmEUFJqUJY4ptroOaj0qowX/e+NaI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601850260; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EsnQHkXixTDHiftbmaI4LL3ZCsUb9cDFGWpHtZJH66o=; b=R6hwcF/F6UkB/r3lDbDrbgo0xZ1JjndWngMsuh04MlwT3ZnqSJBFbopkilTR0GqejXib2cdRDzHqRhZoB05T7xwXAkTP8/f0XnoEUdHQFh2fRnCaJtnSJU7b741+qwzrXPV6Fb/UFUCP5pQkuc6vkLwgaje574dEX/UQlmzLE+s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601850260257643.3346010129717; Sun, 4 Oct 2020 15:24:20 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-321-gujS7YuWPCeV8mNVcckrTQ-1; Sun, 04 Oct 2020 18:24:16 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C58591009639; Sun, 4 Oct 2020 22:24:10 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9EFFC1002C08; Sun, 4 Oct 2020 22:24:10 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6DA3144A4C; Sun, 4 Oct 2020 22:24:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 094MO8KL031922 for ; Sun, 4 Oct 2020 18:24:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id C45025C22B; Sun, 4 Oct 2020 22:24:08 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C07A5C22E for ; Sun, 4 Oct 2020 22:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601850259; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=EsnQHkXixTDHiftbmaI4LL3ZCsUb9cDFGWpHtZJH66o=; b=YkksEn1uF3Hi0ZtEAr00qOrmx01VLPM/pPZOH1Hj6zsVuGyU5YmvSqwBNEjyRtOVUsjRv/ /BskJVel4wwPQKLdMeibngaAvicSKMx8vfShQSWUHXLoe2iC4xWRNv5YE9mrQJWBQW6s/d 1vDOF+1hGFT2Ga6yRuwRkwjmuPqCdi8= X-MC-Unique: gujS7YuWPCeV8mNVcckrTQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] vz: vzEatCookie: use distinct 'tmp' variables Date: Mon, 5 Oct 2020 00:23:57 +0200 Message-Id: <185cfbc629555dd5f8ae73df59a0d1d6cf81ef59.1601850220.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Mark both as g_autofree within their separate scopes. Signed-off-by: J=C3=A1n Tomko --- src/vz/vz_driver.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 5b40f9a835..dad7fe37b7 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2790,7 +2790,6 @@ vzEatCookie(const char *cookiein, int cookieinlen, un= signed int flags) { xmlDocPtr doc =3D NULL; xmlXPathContextPtr ctx =3D NULL; - char *tmp =3D NULL; vzMigrationCookiePtr mig =3D NULL; =20 if (VIR_ALLOC(mig) < 0) @@ -2807,29 +2806,29 @@ vzEatCookie(const char *cookiein, int cookieinlen, = unsigned int flags) goto error; =20 if (flags & VZ_MIGRATION_COOKIE_SESSION_UUID) { + g_autofree char *tmp =3D NULL; + if ((!(tmp =3D virXPathString("string(./session-uuid[1])", ctx)) || (VIR_ALLOC_N(mig->session_uuid, VIR_UUID_BUFLEN) < 0) || (virUUIDParse(tmp, mig->session_uuid) < 0))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing or malformed session-uuid element " "in migration data")); - VIR_FREE(tmp); goto error; } } - VIR_FREE(tmp); =20 if (flags & VZ_MIGRATION_COOKIE_DOMAIN_UUID) { + g_autofree char *tmp =3D NULL; + if ((!(tmp =3D virXPathString("string(./uuid[1])", ctx)) || (VIR_ALLOC_N(mig->uuid, VIR_UUID_BUFLEN) < 0) || (virUUIDParse(tmp, mig->uuid) < 0))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing or malformed uuid element in migrati= on data")); - VIR_FREE(tmp); goto error; } } - VIR_FREE(tmp); =20 if ((flags & VZ_MIGRATION_COOKIE_DOMAIN_NAME) && !(mig->name =3D virXPathString("string(./name[1])", ctx))) { --=20 2.26.2