diff options
| author | Eric Dong <eric.dong@intel.com> | 2014-06-25 05:44:37 +0000 |
|---|---|---|
| committer | ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-06-25 05:44:37 +0000 |
| commit | 393a3169c2a777e3ed899c85f7827258a13f0755 (patch) | |
| tree | 90c7f22086e066d8471987544bdeb3f6c8123061 | |
| parent | 53db912ea1ef7be5cb40e7dbff55d3bc059d9f90 (diff) | |
| download | edk2-platforms-393a3169c2a777e3ed899c85f7827258a13f0755.tar.xz | |
Refine code to make it more safely.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Siyuan Fu <siyuan.fu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15589 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | NetworkPkg/Application/IfConfig6/IfConfig6.c | 3 | ||||
| -rw-r--r-- | NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c | 8 | ||||
| -rw-r--r-- | NetworkPkg/Ip6Dxe/Ip6ConfigNv.c | 3 | ||||
| -rw-r--r-- | NetworkPkg/IpSecDxe/Ikev2/Utility.c | 3 | ||||
| -rw-r--r-- | NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c | 1 |
5 files changed, 11 insertions, 7 deletions
diff --git a/NetworkPkg/Application/IfConfig6/IfConfig6.c b/NetworkPkg/Application/IfConfig6/IfConfig6.c index a2a3582277..36cc749933 100644 --- a/NetworkPkg/Application/IfConfig6/IfConfig6.c +++ b/NetworkPkg/Application/IfConfig6/IfConfig6.c @@ -1,7 +1,7 @@ /** @file
The implementation for Shell application IfConfig6.
- Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -365,6 +365,7 @@ IfConfig6ParseManualAddressList ( UINT8 Prefix;
UINT8 AddrCnt;
+ Prefix = 0;
AddrCnt = 0;
*BufSize = 0;
*Buf = NULL;
diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c index 7591bf56ba..8603669903 100644 --- a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c +++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c @@ -143,10 +143,10 @@ Dhcp6GenerateClientId ( //
// Set the Duid-type, hardware-type, time and copy the hardware address.
//
- WriteUnaligned16 ((UINT16 *) (Duid->Duid), HTONS (Dhcp6DuidTypeLlt));
- WriteUnaligned16 ((UINT16 *) (Duid->Duid + 2), HTONS (NET_IFTYPE_ETHERNET));
- WriteUnaligned32 ((UINT32 *) (Duid->Duid + 4), HTONL (Stamp));
-
+ WriteUnaligned16 ((UINT16 *) ((UINT8 *)&Duid + OFFSET_OF (EFI_DHCP6_DUID, Duid)), HTONS (Dhcp6DuidTypeLlt));
+ WriteUnaligned16 ((UINT16 *) ((UINT8 *)&Duid + OFFSET_OF (EFI_DHCP6_DUID, Duid) + 2), HTONS (NET_IFTYPE_ETHERNET));
+ WriteUnaligned32 ((UINT32 *) ((UINT8 *)&Duid + OFFSET_OF (EFI_DHCP6_DUID, Duid) + 4), HTONL (Stamp));
+
CopyMem (Duid->Duid + 8, &Mode->CurrentAddress, Mode->HwAddressSize);
}
diff --git a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c index eaeb44b2a1..4716f797d4 100644 --- a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c +++ b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c @@ -1,7 +1,7 @@ /** @file
Helper functions for configuring or obtaining the parameters relating to IP6.
- Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -600,6 +600,7 @@ Ip6ParseAddressListFromString ( return EFI_INVALID_PARAMETER;
}
+ ZeroMem (&AddressInfo, sizeof (EFI_IP6_ADDRESS_INFO));
LocalString = (CHAR16 *) AllocateCopyPool (StrSize (String), String);
if (LocalString == NULL) {
return EFI_OUT_OF_RESOURCES;
diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.c b/NetworkPkg/IpSecDxe/Ikev2/Utility.c index f12766f3cb..cb436b65a6 100644 --- a/NetworkPkg/IpSecDxe/Ikev2/Utility.c +++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.c @@ -1,7 +1,7 @@ /** @file
The Common operations used by IKE Exchange Process.
- Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -928,6 +928,7 @@ Ikev2ChildSaSilentDelete ( FreePool (Selector);
Selector = AllocateZeroPool (SelectorSize);
+ ASSERT (Selector != NULL);
Status = EfiIpSecConfigGetNextSelector (
&Private->IpSecConfig,
IPsecConfigDataTypeSad,
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c index 7175e107bb..be3d248fa9 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c @@ -600,6 +600,7 @@ EfiPxeBcDiscover ( if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
+ ASSERT (NewCreatedInfo != NULL);
Info = NewCreatedInfo;
} else {
//
|