From nobody Wed May 14 01:24:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1528124729279712.8764067804609; Mon, 4 Jun 2018 08:05:29 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3D533D7E53; Mon, 4 Jun 2018 15:05:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF8955B681; Mon, 4 Jun 2018 15:05:26 +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 892301800FD9; Mon, 4 Jun 2018 15:05:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w54Eb08u008177 for ; Mon, 4 Jun 2018 10:37:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 49CB22016A81; Mon, 4 Jun 2018 14:37:00 +0000 (UTC) Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4035B2016A80 for ; Mon, 4 Jun 2018 14:37:00 +0000 (UTC) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 191FFC0D4726 for ; Mon, 4 Jun 2018 14:36:49 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id w7-v6so690334pfn.9 for ; Mon, 04 Jun 2018 07:36:49 -0700 (PDT) Received: from centos.localdomain ([42.106.2.208]) by smtp.gmail.com with ESMTPSA id f63-v6sm23448806pfe.143.2018.06.04.07.36.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jun 2018 07:36:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=5lS8s/Exorw8W9Row1xyoPdCg9BFKURzqUpbEV/O2lQ=; b=VGnID0BkqocVC7Uefc6DwKz9dSJyrqXHlyLqlBxOhbF3acXrDKdw6J+VjcqkpQ22Hb SYdQEaJYNRXAq1y3IoNlBJNiBfXavOL+91iJQJFTFbRxww329Pa7TPCqPeVTm9aYy0ak ohF8BkGrg0zLcBS+rtLW4ULlqo7u+YqXkRAXR2ry6UjEaM0CovjcXCCbP9m6N5fLTEIg OhdesV7i4JJ7tlC2i1Ro6xap4vw2cAobgbPL181sNrsIVn5fuAgd/2vJRQMj0xVOvVWP iBsSgfMBoxJEP0lkaLq8YrpQsSm+IYdQT/adB/Oh6uK6z1n7LJLM8wnscq0p/Fn3wywn j7aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=5lS8s/Exorw8W9Row1xyoPdCg9BFKURzqUpbEV/O2lQ=; b=PkqGMCaJmg7pEeDUAQIgFuwyhDVhaIDBeZ4XZOcbXUSZaayNnbJxyOzG+O4g86laI1 9ZB2W4cN1QZRKdRRhlKbliz3dnYaTVIl124GGtnbzI9XVyyAjpBC/dXostInn2ZhHOsd XJZZfLIi7WbSXnn993UueE/yUisS7MN6OesIcWOqg9DrDaTDY+hHCVt89OR22tjXjrOq gWda7PRCoVaa6sTVGuC03/P3KW3h4LlfYjqHPaOOHGCG/mrtEa0ZF/lLZwH+frXsEuvj IkaYusnD/7eZTREJNnPFbTRv1hkjGtA1c535Nakc7yQC3wWVKOcHp6fqF+O+oNTH9mrX cOaw== X-Gm-Message-State: ALKqPwfz3Qnc8HJGKnGn5X1dJtDH0V1I2c4gtGbQthyZGGeyU9iDHBAg cKVsdiKAbgRvM+Ny482iToRB5icV X-Google-Smtp-Source: ADUXVKJisW1m5JCuyKEUIE1FKzOlscI1NZWqZF+lWgwmu2xzBTSUjIxXM9xQXFHDq3/d+VueD6gMQA== X-Received: by 2002:a62:ed12:: with SMTP id u18-v6mr21741670pfh.127.1528123008204; Mon, 04 Jun 2018 07:36:48 -0700 (PDT) From: Sukrit Bhatnagar To: libvir-list@redhat.com Date: Sun, 3 Jun 2018 13:42:10 +0530 Message-Id: <1528013536-22196-13-git-send-email-skrtbhtngr@gmail.com> In-Reply-To: <1528013536-22196-1-git-send-email-skrtbhtngr@gmail.com> References: <1528013536-22196-1-git-send-email-skrtbhtngr@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 04 Jun 2018 14:36:49 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 04 Jun 2018 14:36:49 +0000 (UTC) for IP:'209.85.192.194' DOMAIN:'mail-pf0-f194.google.com' HELO:'mail-pf0-f194.google.com' FROM:'skrtbhtngr@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.991 (DATE_IN_PAST_24_48, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, NML_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS, T_DKIM_INVALID) 209.85.192.194 mail-pf0-f194.google.com 209.85.192.194 mail-pf0-f194.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v1 12/18] use VIR_AUTOFREE in src/util/virdbus.c 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 04 Jun 2018 15:05:27 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Modify code to use VIR_AUTOFREE macro wherever required. Signed-off-by: Sukrit Bhatnagar --- src/util/virdbus.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/util/virdbus.c b/src/util/virdbus.c index ba8b684..66dbe41 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -614,9 +614,8 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, size_t nstack =3D 0; size_t siglen; size_t skiplen; - char *contsig =3D NULL; const char *vsig; - DBusMessageIter *newiter =3D NULL; + VIR_AUTOFREE(DBusMessageIter *) newiter =3D NULL; DBusMessageIter *iter =3D rootiter; =20 VIR_DEBUG("rootiter=3D%p types=3D%s", rootiter, types); @@ -628,6 +627,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, nstruct =3D strlen(types); =20 for (;;) { + VIR_AUTOFREE(char *) contsig =3D NULL; const char *t; =20 VIR_DEBUG("Loop nstack=3D%zu narray=3D%zd nstruct=3D%zu types=3D'%= s'", @@ -752,11 +752,8 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, goto cleanup; if (virDBusTypeStackPush(&stack, &nstack, iter, types, - nstruct, narray) < 0) { - VIR_FREE(newiter); + nstruct, narray) < 0) goto cleanup; - } - VIR_FREE(contsig); iter =3D newiter; newiter =3D NULL; types =3D t + 1; @@ -780,10 +777,8 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, goto cleanup; if (virDBusTypeStackPush(&stack, &nstack, iter, types, - nstruct, narray) < 0) { - VIR_FREE(newiter); + nstruct, narray) < 0) goto cleanup; - } iter =3D newiter; newiter =3D NULL; types =3D vsig; @@ -811,11 +806,8 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, =20 if (virDBusTypeStackPush(&stack, &nstack, iter, types, - nstruct, narray) < 0) { - VIR_FREE(newiter); + nstruct, narray) < 0) goto cleanup; - } - VIR_FREE(contsig); iter =3D newiter; newiter =3D NULL; types =3D t + 1; @@ -847,8 +839,6 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, } =20 virDBusTypeStackFree(&stack, &nstack); - VIR_FREE(contsig); - VIR_FREE(newiter); return ret; } # undef SET_NEXT_VAL @@ -891,9 +881,8 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, size_t nstack =3D 0; size_t skiplen; size_t siglen; - char *contsig =3D NULL; const char *vsig; - DBusMessageIter *newiter =3D NULL; + VIR_AUTOFREE(DBusMessageIter *) newiter =3D NULL; DBusMessageIter *iter =3D rootiter; =20 VIR_DEBUG("rootiter=3D%p types=3D%s", rootiter, types); @@ -905,6 +894,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, nstruct =3D strlen(types); =20 for (;;) { + VIR_AUTOFREE(char *) contsig =3D NULL; const char *t; bool advanceiter =3D true; =20 @@ -1053,7 +1043,6 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, iter, types, nstruct, narray) < 0) goto cleanup; - VIR_FREE(contsig); iter =3D newiter; newiter =3D NULL; types =3D t + 1; @@ -1112,7 +1101,6 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, iter, types, nstruct, narray) < 0) goto cleanup; - VIR_FREE(contsig); iter =3D newiter; newiter =3D NULL; types =3D t + 1; @@ -1167,8 +1155,6 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, =20 cleanup: virDBusTypeStackFree(&stack, &nstack); - VIR_FREE(contsig); - VIR_FREE(newiter); return ret; } # undef GET_NEXT_VAL --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list