From 3fd7bd08f438130f9fcbcc1ab4392dea1a859c14 Mon Sep 17 00:00:00 2001 From: fanwang2 Date: Fri, 10 Jul 2015 09:00:33 +0000 Subject: NetworkPkg: Code logic optimization for DnsDxe and HttpDxe driver Revise some errors which may lead NULL pointer be dereferenced: * DnsDhcp.c: Paralist may be used without any initialized * DnsHeader and RcvString may be null but be dereferenced * HttpDriver.c: revise an if judgment * HttpImpl.c: add a judgment to avoid null dereferenced Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: fanwang2 Reviewed-by: Ye Ting Reviewed-by: Jiaxin Wu git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17923 6f19259b-4bc3-4df7-8a09-765794883524 --- NetworkPkg/HttpDxe/HttpDriver.c | 2 +- NetworkPkg/HttpDxe/HttpImpl.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'NetworkPkg/HttpDxe') diff --git a/NetworkPkg/HttpDxe/HttpDriver.c b/NetworkPkg/HttpDxe/HttpDriver.c index b65607a4cb..43f42e29bf 100644 --- a/NetworkPkg/HttpDxe/HttpDriver.c +++ b/NetworkPkg/HttpDxe/HttpDriver.c @@ -79,7 +79,7 @@ HttpCleanService ( IN HTTP_SERVICE *HttpService ) { - if (HttpService != NULL) { + if (HttpService == NULL) { return ; } diff --git a/NetworkPkg/HttpDxe/HttpImpl.c b/NetworkPkg/HttpDxe/HttpImpl.c index 4bd4ac884f..545fe42332 100644 --- a/NetworkPkg/HttpDxe/HttpImpl.c +++ b/NetworkPkg/HttpDxe/HttpImpl.c @@ -766,6 +766,10 @@ HttpResponseWorker ( HTTP_TOKEN_WRAP *ValueInItem; UINTN HdrLen; + if (Wrap == NULL || Wrap->HttpInstance == NULL) { + return EFI_INVALID_PARAMETER; + } + HttpInstance = Wrap->HttpInstance; Token = Wrap->HttpToken; -- cgit v1.2.3