From nobody Fri May 16 07:06:40 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.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1498649896395120.96309699164453; Wed, 28 Jun 2017 04:38:16 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E1BD334594; Wed, 28 Jun 2017 11:38:14 +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 290BE17D11; Wed, 28 Jun 2017 11:38:14 +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 C933941F77; Wed, 28 Jun 2017 11:38:13 +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 v5SBbh9l004314 for ; Wed, 28 Jun 2017 07:37:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 878865C3FB; Wed, 28 Jun 2017 11:37:43 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-36.phx2.redhat.com [10.3.116.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CC5A7ABEC for ; Wed, 28 Jun 2017 11:37:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4E1BD334594 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4E1BD334594 From: John Ferlan To: libvir-list@redhat.com Date: Wed, 28 Jun 2017 07:37:38 -0400 Message-Id: <20170628113738.27502-5-jferlan@redhat.com> In-Reply-To: <20170628113738.27502-1-jferlan@redhat.com> References: <20170628113738.27502-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] test: Fix possible ap leak for VIR_TEST_PRELOAD 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 28 Jun 2017 11:38:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit id 'f0469c61e' added the ability to load multiple mock libraries by using the va_start() varable args marker; however, if something within the VIR_TEST_PRELOAD fails, then control is returned to caller without calling va_end. So add a couple more markers to indicat the need to call va_end w/ the ap before returning. Signed-off-by: John Ferlan --- tests/qemucapsprobe.c | 2 +- tests/testutils.c | 4 ++-- tests/testutils.h | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index 662c703..bca43b4 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -48,7 +48,7 @@ main(int argc, char **argv) virThread thread; virQEMUCapsPtr caps; =20 - VIR_TEST_PRELOAD(abs_builddir "/.libs/qemucapsprobemock.so"); + VIR_TEST_PRELOAD(abs_builddir "/.libs/qemucapsprobemock.so", false, NU= LL); =20 if (argc !=3D 2) { fprintf(stderr, "%s QEMU_binary\n", argv[0]); diff --git a/tests/testutils.c b/tests/testutils.c index f455969..16fd3c6 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -904,11 +904,11 @@ int virTestMain(int argc, virLogOutputPtr *outputs =3D NULL; =20 if (getenv("VIR_TEST_FILE_ACCESS")) - VIR_TEST_PRELOAD(TEST_MOCK); + VIR_TEST_PRELOAD(TEST_MOCK, false, NULL); =20 va_start(ap, func); while ((lib =3D va_arg(ap, const char *))) - VIR_TEST_PRELOAD(lib); + VIR_TEST_PRELOAD(lib, true, ap); va_end(ap); =20 progname =3D last_component(argv[0]); diff --git a/tests/testutils.h b/tests/testutils.h index c7f02e4..e4c602b 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -115,12 +115,14 @@ int virTestMain(int argc, return virTestMain(argc, argv, func, NULL); \ } =20 -# define VIR_TEST_PRELOAD(lib) \ +# define VIR_TEST_PRELOAD(lib, haveap, _ap) \ do { \ const char *preload =3D getenv("LD_PRELOAD"); \ if (preload =3D=3D NULL || strstr(preload, lib) =3D=3D NULL) { = \ char *newenv; \ if (!virFileIsExecutable(lib)) { \ + if (haveap) \ + va_end(_ap); \ perror(lib); \ return EXIT_FAILURE; \ } \ @@ -128,6 +130,8 @@ int virTestMain(int argc, newenv =3D (char *) lib; \ } else if (virAsprintf(&newenv, "%s:%s", lib, preload) < 0) { = \ perror("virAsprintf"); \ + if (haveap) \ + va_end(_ap); \ return EXIT_FAILURE; \ } \ setenv("LD_PRELOAD", newenv, 1); \ --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list