diff options
| author | Jiaxin Wu <jiaxin.wu@intel.com> | 2016-05-25 16:22:26 +0800 |
|---|---|---|
| committer | Jiaxin Wu <jiaxin.wu@intel.com> | 2016-05-26 16:10:55 +0800 |
| commit | 6be1193f14a988c280e045e70c90df51e1b0fc26 (patch) | |
| tree | 9d2bbb0f0db4d8287a1d67eef1f38a6858328d67 | |
| parent | 6c2b77210fe9fcb59a9530d835bcfe3759376a01 (diff) | |
| download | edk2-6be1193f14a988c280e045e70c90df51e1b0fc26.zip edk2-6be1193f14a988c280e045e70c90df51e1b0fc26.tar.gz edk2-6be1193f14a988c280e045e70c90df51e1b0fc26.tar.bz2 | |
NetworkPkg: Correct HttpConfigure parameter check
When HttpConfigData is NULL, HttpConfigure should not return
EFI_INVALID_PARAMETER.
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Zhang Lubo <lubo.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Zhang Lubo <lubo.zhang@intel.com>
| -rw-r--r-- | NetworkPkg/HttpDxe/HttpImpl.c | 9 | ||||
| -rw-r--r-- | NetworkPkg/HttpDxe/HttpImpl.h | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/NetworkPkg/HttpDxe/HttpImpl.c b/NetworkPkg/HttpDxe/HttpImpl.c index 7ee6613..12f22db 100644 --- a/NetworkPkg/HttpDxe/HttpImpl.c +++ b/NetworkPkg/HttpDxe/HttpImpl.c @@ -114,7 +114,6 @@ EfiHttpGetModeData ( @retval EFI_SUCCESS Operation succeeded.
@retval EFI_INVALID_PARAMETER One or more of the following conditions is TRUE:
This is NULL.
- HttpConfigData is NULL.
HttpConfigData->LocalAddressIsIPv6 is FALSE and
HttpConfigData->IPv4Node is NULL.
HttpConfigData->LocalAddressIsIPv6 is TRUE and
@@ -141,9 +140,9 @@ EfiHttpConfigure ( // Check input parameters.
//
if (This == NULL ||
- HttpConfigData == NULL ||
- ((HttpConfigData->LocalAddressIsIPv6 && HttpConfigData->AccessPoint.IPv6Node == NULL) ||
- (!HttpConfigData->LocalAddressIsIPv6 && HttpConfigData->AccessPoint.IPv4Node == NULL))) {
+ (HttpConfigData != NULL &&
+ ((HttpConfigData->LocalAddressIsIPv6 && HttpConfigData->AccessPoint.IPv6Node == NULL) ||
+ (!HttpConfigData->LocalAddressIsIPv6 && HttpConfigData->AccessPoint.IPv4Node == NULL)))) {
return EFI_INVALID_PARAMETER;
}
@@ -254,6 +253,7 @@ EfiHttpRequest ( //
Url = NULL;
UrlParser = NULL;
+ RemotePort = 0;
HostName = NULL;
RequestMsg = NULL;
HostNameStr = NULL;
@@ -908,6 +908,7 @@ HttpResponseWorker ( SizeofHeaders = 0;
BufferSize = 0;
EndofHeader = NULL;
+ ValueInItem = NULL;
if (HttpMsg->Data.Response != NULL) {
//
diff --git a/NetworkPkg/HttpDxe/HttpImpl.h b/NetworkPkg/HttpDxe/HttpImpl.h index 415b5e5..40b2504 100644 --- a/NetworkPkg/HttpDxe/HttpImpl.h +++ b/NetworkPkg/HttpDxe/HttpImpl.h @@ -72,7 +72,6 @@ EfiHttpGetModeData ( @retval EFI_SUCCESS Operation succeeded.
@retval EFI_INVALID_PARAMETER One or more of the following conditions is TRUE:
This is NULL.
- HttpConfigData is NULL.
HttpConfigData->LocalAddressIsIPv6 is FALSE and
HttpConfigData->IPv4Node is NULL.
HttpConfigData->LocalAddressIsIPv6 is TRUE and
|