summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a7912d4)
This patch updates the IP4 driver to use error status code instead of ASSERT
if failed to allocate memory buffer.
Reviewed-by: Ye Ting <ting.ye@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
@param[in] IpCount The size of IPv4 address list.\r
@param[out] Str The string contains several decimal dotted\r
IPv4 addresses separated by space. \r
@param[in] IpCount The size of IPv4 address list.\r
@param[out] Str The string contains several decimal dotted\r
IPv4 addresses separated by space. \r
+\r
+ @retval EFI_SUCCESS Operation is success.\r
+ @retval EFI_OUT_OF_RESOURCES Error occurs in allocating memory.\r
+\r
Ip4Config2IpListToStr (\r
IN EFI_IPv4_ADDRESS *Ip,\r
IN UINTN IpCount,\r
Ip4Config2IpListToStr (\r
IN EFI_IPv4_ADDRESS *Ip,\r
IN UINTN IpCount,\r
TempIp = Ip + Index;\r
if (TempStr == NULL) {\r
TempStr = AllocateZeroPool(2 * IP4_STR_MAX_SIZE);\r
TempIp = Ip + Index;\r
if (TempStr == NULL) {\r
TempStr = AllocateZeroPool(2 * IP4_STR_MAX_SIZE);\r
- ASSERT(TempStr != NULL);\r
+ if (TempStr == NULL) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
if (TempStr != NULL) {\r
FreePool(TempStr);\r
}\r
if (TempStr != NULL) {\r
FreePool(TempStr);\r
}\r
+\r
+ return EFI_SUCCESS;\r
Ip4Config2IpToStr (&Ip4Info->StationAddress, IfrNvData->StationAddress);\r
Ip4Config2IpToStr (&Ip4Info->SubnetMask, IfrNvData->SubnetMask);\r
Ip4Config2IpToStr (&GatewayAddress, IfrNvData->GatewayAddress);\r
Ip4Config2IpToStr (&Ip4Info->StationAddress, IfrNvData->StationAddress);\r
Ip4Config2IpToStr (&Ip4Info->SubnetMask, IfrNvData->SubnetMask);\r
Ip4Config2IpToStr (&GatewayAddress, IfrNvData->GatewayAddress);\r
- Ip4Config2IpListToStr (DnsAddress, DnsCount, IfrNvData->DnsAddress);\r
+ Status = Ip4Config2IpListToStr (DnsAddress, DnsCount, IfrNvData->DnsAddress);\r
ConfigRequestHdr = HiiConstructConfigHdr (&gIp4Config2NvDataGuid, mIp4Config2StorageName, Private->ChildHandle);\r
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (Size);\r
ConfigRequestHdr = HiiConstructConfigHdr (&gIp4Config2NvDataGuid, mIp4Config2StorageName, Private->ChildHandle);\r
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (Size);\r
- ASSERT (ConfigRequest != NULL);\r
+ if (ConfigRequest == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto Failure;\r
+ }\r
AllocatedRequest = TRUE;\r
\r
UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r
AllocatedRequest = TRUE;\r
\r
UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r