From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.24; helo=mga09.intel.com; envelope-from=jiaxin.wu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 EE0B42034A875 for ; Thu, 26 Oct 2017 19:20:03 -0700 (PDT) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Oct 2017 19:23:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,303,1505804400"; d="scan'208";a="142720420" Received: from jiaxinwu-mobl2.ccr.corp.intel.com ([10.239.196.184]) by orsmga004.jf.intel.com with ESMTP; 26 Oct 2017 19:23:49 -0700 From: Jiaxin Wu To: edk2-devel@lists.01.org Cc: Wu Hao A , Ye Ting , Fu Siyuan , Wu Jiaxin Date: Fri, 27 Oct 2017 10:23:44 +0800 Message-Id: <1509071025-38548-2-git-send-email-jiaxin.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1509071025-38548-1-git-send-email-jiaxin.wu@intel.com> References: <1509071025-38548-1-git-send-email-jiaxin.wu@intel.com> Subject: [Patch 1/2] NetworkPkg/HttpBootDxe: Add check to avoid use NULL pointer X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Oct 2017 02:20:04 -0000 Cc: Wu Hao A Cc: Ye Ting Cc: Fu Siyuan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Wu Jiaxin --- NetworkPkg/HttpBootDxe/HttpBootDxe.c | 50 +++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/NetworkPkg/HttpBootDxe/HttpBootDxe.c b/NetworkPkg/HttpBootDxe/HttpBootDxe.c index b1f9042..8a61f51 100644 --- a/NetworkPkg/HttpBootDxe/HttpBootDxe.c +++ b/NetworkPkg/HttpBootDxe/HttpBootDxe.c @@ -613,23 +613,25 @@ HttpBootIp4DxeDriverBindingStart ( } return EFI_SUCCESS; ON_ERROR: - if (FirstStart) { - gBS->UninstallProtocolInterface ( - ControllerHandle, - &gEfiCallerIdGuid, - &Private->Id - ); - } - - HttpBootDestroyIp4Children (This, Private); - HttpBootConfigFormUnload (Private); + if (Private != NULL) { + if (FirstStart) { + gBS->UninstallProtocolInterface ( + ControllerHandle, + &gEfiCallerIdGuid, + &Private->Id + ); + } + + HttpBootDestroyIp4Children (This, Private); + HttpBootConfigFormUnload (Private); - if (FirstStart && Private != NULL) { - FreePool (Private); + if (FirstStart) { + FreePool (Private); + } } return Status; } @@ -1142,23 +1144,25 @@ HttpBootIp6DxeDriverBindingStart ( } return EFI_SUCCESS; ON_ERROR: - if (FirstStart) { - gBS->UninstallProtocolInterface ( - ControllerHandle, - &gEfiCallerIdGuid, - &Private->Id - ); - } + if (Private != NULL) { + if (FirstStart) { + gBS->UninstallProtocolInterface ( + ControllerHandle, + &gEfiCallerIdGuid, + &Private->Id + ); + } - HttpBootDestroyIp6Children(This, Private); - HttpBootConfigFormUnload (Private); + HttpBootDestroyIp6Children(This, Private); + HttpBootConfigFormUnload (Private); - if (FirstStart && Private != NULL) { - FreePool (Private); + if (FirstStart) { + FreePool (Private); + } } return Status; } -- 1.9.5.msysgit.1