From nobody Sat May 4 08:46:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1514270125340441.7425262266395; Mon, 25 Dec 2017 22:35:25 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 351CD222F4E17; Mon, 25 Dec 2017 22:30:30 -0800 (PST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4101321CB87A5 for ; Mon, 25 Dec 2017 22:30:27 -0800 (PST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Dec 2017 22:35:21 -0800 Received: from jiaxinwu-mobl2.ccr.corp.intel.com ([10.239.196.165]) by fmsmga006.fm.intel.com with ESMTP; 25 Dec 2017 22:35:20 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=jiaxin.wu@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,458,1508828400"; d="scan'208";a="190005806" From: Jiaxin Wu To: edk2-devel@lists.01.org Date: Tue, 26 Dec 2017 14:35:13 +0800 Message-Id: <1514270114-5776-2-git-send-email-jiaxin.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1514270114-5776-1-git-send-email-jiaxin.wu@intel.com> References: <1514270114-5776-1-git-send-email-jiaxin.wu@intel.com> Subject: [edk2] [Patch 1/2] NetworkPkg/HttpDxe: Fix the memory leak issue in HttpRequest(). X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ye Ting , Wang Fan , Fu Siyuan , Wu Jiaxin MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Cc: Wang Fan Cc: Ye Ting Cc: Fu Siyuan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Wu Jiaxin Reviewed-by: Fu Siyuan --- NetworkPkg/HttpDxe/HttpImpl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/NetworkPkg/HttpDxe/HttpImpl.c b/NetworkPkg/HttpDxe/HttpImpl.c index 57fa39f..fe1c3b7 100644 --- a/NetworkPkg/HttpDxe/HttpImpl.c +++ b/NetworkPkg/HttpDxe/HttpImpl.c @@ -470,10 +470,12 @@ EfiHttpRequest ( =20 Wrap->TcpWrap.Method =3D Request->Method; =20 FreePool (HostName); =20 + HttpUrlFreeParser (UrlParser); + // // Queue the HTTP token and return. // return EFI_SUCCESS; } else { @@ -654,10 +656,14 @@ EfiHttpRequest ( DispatchDpc (); =20 if (HostName !=3D NULL) { FreePool (HostName); } + + if (UrlParser !=3D NULL) { + HttpUrlFreeParser (UrlParser); + } =20 return EFI_SUCCESS; =20 Error5: // @@ -697,11 +703,11 @@ Error1: FreePool (HostName); } if (Wrap !=3D NULL) { FreePool (Wrap); } - if (UrlParser!=3D NULL) { + if (UrlParser !=3D NULL) { HttpUrlFreeParser (UrlParser); } =20 return Status; =20 --=20 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 08:46:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1514270128030920.7089919554161; Mon, 25 Dec 2017 22:35:28 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 85E0A222F4E1A; Mon, 25 Dec 2017 22:30:30 -0800 (PST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 829DB222CB332 for ; Mon, 25 Dec 2017 22:30:28 -0800 (PST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Dec 2017 22:35:22 -0800 Received: from jiaxinwu-mobl2.ccr.corp.intel.com ([10.239.196.165]) by fmsmga006.fm.intel.com with ESMTP; 25 Dec 2017 22:35:21 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=jiaxin.wu@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,458,1508828400"; d="scan'208";a="190005813" From: Jiaxin Wu To: edk2-devel@lists.01.org Date: Tue, 26 Dec 2017 14:35:14 +0800 Message-Id: <1514270114-5776-3-git-send-email-jiaxin.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1514270114-5776-1-git-send-email-jiaxin.wu@intel.com> References: <1514270114-5776-1-git-send-email-jiaxin.wu@intel.com> Subject: [edk2] [Patch 2/2] NetworkPkg/HttpDxe: Remove the unnecessary ASSERT. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ye Ting , Wang Fan , Fu Siyuan , Wu Jiaxin MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Cc: Wang Fan Cc: Ye Ting Cc: Fu Siyuan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Wu Jiaxin Reviewed-by: Fu Siyuan --- NetworkPkg/HttpDxe/HttpImpl.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/NetworkPkg/HttpDxe/HttpImpl.c b/NetworkPkg/HttpDxe/HttpImpl.c index fe1c3b7..b3a64cf 100644 --- a/NetworkPkg/HttpDxe/HttpImpl.c +++ b/NetworkPkg/HttpDxe/HttpImpl.c @@ -63,11 +63,10 @@ EfiHttpGetModeData ( if ((This =3D=3D NULL) || (HttpConfigData =3D=3D NULL)) { return EFI_INVALID_PARAMETER; } =20 HttpInstance =3D HTTP_INSTANCE_FROM_PROTOCOL (This); - ASSERT (HttpInstance !=3D NULL); =20 if ((HttpConfigData->AccessPoint.IPv6Node =3D=3D NULL) || (HttpConfigData->AccessPoint.IPv4Node =3D=3D NULL)) { return EFI_INVALID_PARAMETER; } @@ -147,11 +146,11 @@ EfiHttpConfigure ( (!HttpConfigData->LocalAddressIsIPv6 && HttpConfigData->AccessPoin= t.IPv4Node =3D=3D NULL)))) { return EFI_INVALID_PARAMETER; } =20 HttpInstance =3D HTTP_INSTANCE_FROM_PROTOCOL (This); - ASSERT (HttpInstance !=3D NULL && HttpInstance->Service !=3D NULL); + ASSERT (HttpInstance->Service !=3D NULL); =20 if (HttpConfigData !=3D NULL) { =20 if (HttpConfigData->HttpVersion >=3D HttpVersionUnsupported) { return EFI_UNSUPPORTED; @@ -289,11 +288,10 @@ EfiHttpRequest ( (Request->Method !=3D HttpMethodPost) && (Request->Method !=3D HttpM= ethodPatch)) { return EFI_UNSUPPORTED; } =20 HttpInstance =3D HTTP_INSTANCE_FROM_PROTOCOL (This); - ASSERT (HttpInstance !=3D NULL); =20 // // Capture the method into HttpInstance. // if (Request !=3D NULL) { @@ -623,12 +621,10 @@ EfiHttpRequest ( =20 if (EFI_ERROR (Status) || NULL =3D=3D RequestMsg) { goto Error3; } =20 - ASSERT (RequestMsg !=3D NULL); - // // Every request we insert a TxToken and a response call would remove th= e TxToken. // In cases of PUT/POST/PATCH, after an initial request-response pair, w= e would do a // continuous request without a response call. So, in such cases, where = Request // structure is NULL, we would not insert a TxToken. @@ -885,11 +881,10 @@ EfiHttpCancel ( if (This =3D=3D NULL) { return EFI_INVALID_PARAMETER; } =20 HttpInstance =3D HTTP_INSTANCE_FROM_PROTOCOL (This); - ASSERT (HttpInstance !=3D NULL); =20 if (HttpInstance->State !=3D HTTP_STATE_TCP_CONNECTED) { return EFI_NOT_STARTED; } =20 @@ -1543,11 +1538,10 @@ EfiHttpResponse ( if (HttpMsg =3D=3D NULL) { return EFI_INVALID_PARAMETER; } =20 HttpInstance =3D HTTP_INSTANCE_FROM_PROTOCOL (This); - ASSERT (HttpInstance !=3D NULL); =20 if (HttpInstance->State !=3D HTTP_STATE_TCP_CONNECTED) { return EFI_NOT_STARTED; } =20 @@ -1639,11 +1633,10 @@ EfiHttpPoll ( if (This =3D=3D NULL) { return EFI_INVALID_PARAMETER; } =20 HttpInstance =3D HTTP_INSTANCE_FROM_PROTOCOL (This); - ASSERT (HttpInstance !=3D NULL); =20 if (HttpInstance->State !=3D HTTP_STATE_TCP_CONNECTED) { return EFI_NOT_STARTED; } =20 --=20 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel