From nobody Mon Apr 29 00:11:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1576805307; cv=none; d=zohomail.com; s=zohoarc; b=W+Tmli8QKmwW0aWaM/ndpEnk3g4qqD06UuuYmnnWu29CS+GxKHVrVDJNBxM3QWJ3wsYCVJgh0VUSImMvmUOGKxJ+zDVM60UJAktms/ZGVdja9cZp4qJq+pAOp5Zno1WP4MYAkzWqn+sRydvuBo8OQFATqAyfLrbYrtjhyYO1CCw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576805307; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Rnl8DNFpsyi8EXx28zzbdSUxcIB9AfZWBz7VcuQmZa8=; b=kid+0ybp5bCld4A8b3xiyXzpS0Y8i0fR2Ctcbq8QqRpNONBsZ0vF6uIeWdznS+fFbK0AymUD8Cvel2qhtTqm4+4LXaIT3B7/M6PEk8XxoHUhvhS7u/PoSuOLHMbykYqnktpAUumFnD9eXRgrgF2dxIFkJWM0auGHh6emMoxUG1I= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576805307523819.2773376396945; Thu, 19 Dec 2019 17:28:27 -0800 (PST) Received: from localhost ([::1]:49492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ii75c-0005WM-JW for importer@patchew.org; Thu, 19 Dec 2019 20:28:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49170) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ii74i-00055R-Bx for qemu-devel@nongnu.org; Thu, 19 Dec 2019 20:27:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ii74f-0002sh-F0 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 20:27:26 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:55692 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ii74d-0002c7-FR for qemu-devel@nongnu.org; Thu, 19 Dec 2019 20:27:23 -0500 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 4A2291230EC708B85930; Fri, 20 Dec 2019 09:27:13 +0800 (CST) Received: from HGHY2P002143101.china.huawei.com (10.184.39.213) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.439.0; Fri, 20 Dec 2019 09:27:03 +0800 From: To: , , Subject: [PATCH V2] vhost-user-test: fix a memory leak Date: Fri, 20 Dec 2019 09:26:54 +0800 Message-ID: <1576805214-2508-1-git-send-email-pannengyuan@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.184.39.213] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pan Nengyuan , zhang.zhanghailiang@huawei.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Pan Nengyuan Spotted by ASAN. Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Reviewed-by: Thomas Huth --- Changes V2 to V1: - use a "goto cleanup", instead of duplicating the "free" functions. - free "dest_cmdline" at the end. --- tests/vhost-user-test.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 91ea373..dcb8617 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -717,7 +717,7 @@ static void test_migrate(void *obj, void *arg, QGuestAl= locator *alloc) guint64 size; =20 if (!wait_for_fds(s)) { - return; + goto cleanup; } =20 size =3D get_log_size(s); @@ -776,8 +776,11 @@ static void test_migrate(void *obj, void *arg, QGuestA= llocator *alloc) g_source_unref(source); =20 qtest_quit(to); + + cleanup: test_server_free(dest); g_free(uri); + g_string_free(dest_cmdline, true); } =20 static void wait_for_rings_started(TestServer *s, size_t count) --=20 2.7.2.windows.1