for (Index = 0; Index < StringCount; Index++) {\r
BlockSize += AsciiStrSize ((CHAR8 *) StringTextPtr);\r
if (CurrentStringId == StringId) {\r
+ ASSERT (BlockType != NULL && StringBlockAddr != NULL && StringTextOffset != NULL);\r
*BlockType = *BlockHdr;\r
*StringBlockAddr = BlockHdr;\r
*StringTextOffset = StringTextPtr - BlockHdr;\r
for (Index = 0; Index < StringCount; Index++) {\r
BlockSize += AsciiStrSize ((CHAR8 *) StringTextPtr);\r
if (CurrentStringId == StringId) {\r
+ ASSERT (BlockType != NULL && StringBlockAddr != NULL && StringTextOffset != NULL);\r
*BlockType = *BlockHdr;\r
*StringBlockAddr = BlockHdr;\r
*StringTextOffset = StringTextPtr - BlockHdr;\r
GetUnicodeStringTextOrSize (NULL, StringTextPtr, &StringSize);\r
BlockSize += StringSize;\r
if (CurrentStringId == StringId) {\r
+ ASSERT (BlockType != NULL && StringBlockAddr != NULL && StringTextOffset != NULL);\r
*BlockType = *BlockHdr;\r
*StringBlockAddr = BlockHdr;\r
*StringTextOffset = StringTextPtr - BlockHdr;\r
GetUnicodeStringTextOrSize (NULL, StringTextPtr, &StringSize);\r
BlockSize += StringSize;\r
if (CurrentStringId == StringId) {\r
+ ASSERT (BlockType != NULL && StringBlockAddr != NULL && StringTextOffset != NULL);\r
*BlockType = *BlockHdr;\r
*StringBlockAddr = BlockHdr;\r
*StringTextOffset = StringTextPtr - BlockHdr;\r
//\r
// Get last string ID\r
//\r
- if (StringId == (EFI_STRING_ID) (-1)) {\r
+ if (StringId == (EFI_STRING_ID) (-1) && LastStringId != NULL) {\r
*LastStringId = (EFI_STRING_ID) (CurrentStringId - 1);\r
return EFI_SUCCESS;\r
}\r
IN NET_ARP_ADDRESS *AddressTwo\r
)\r
{\r
+ ASSERT (AddressOne != NULL && AddressTwo != NULL);\r
+\r
if ((AddressOne->Type != AddressTwo->Type) ||\r
(AddressOne->Length != AddressTwo->Length)) {\r
//\r
}\r
\r
NewPacket->Ip.Ip4 = Assemble->Head;\r
- CopyMem (IP4_GET_CLIP_INFO (NewPacket), Assemble->Info, sizeof (*IP4_GET_CLIP_INFO (NewPacket)));\r
+\r
+ ASSERT (Assemble->Info != NULL);\r
+\r
+ CopyMem (\r
+ IP4_GET_CLIP_INFO (NewPacket),\r
+ Assemble->Info,\r
+ sizeof (*IP4_GET_CLIP_INFO (NewPacket))\r
+ );\r
+\r
return NewPacket;\r
}\r
\r
// headless. Trim the head off after copy. The IP head\r
// may be not continuous before the data.\r
//\r
- Head = NetbufAllocSpace (Dup, IP4_MAX_HEADLEN, NET_BUF_HEAD);\r
+ Head = NetbufAllocSpace (Dup, IP4_MAX_HEADLEN, NET_BUF_HEAD);\r
+ ASSERT (Head != NULL);\r
+ \r
Dup->Ip.Ip4 = (IP4_HEAD *) Head;\r
\r
CopyMem (Head, Packet->Ip.Ip4, Packet->Ip.Ip4->HeadLen << 2);\r
Link = GetNextNode (&Question->OptionListHead, Link);\r
\r
StringPtr = GetToken (OneOfOption->Text, MenuOption->Handle);\r
+ ASSERT (StringPtr != NULL);\r
//\r
// If the string occupies multiple lines, truncate it to fit in one line,\r
// and append a "..." for indication.\r
\r
if (!Suppress) {\r
StringPtr = GetToken (Statement->Prompt, Handle);\r
+ ASSERT (StringPtr != NULL);\r
\r
Width = GetWidth (Statement, Handle);\r
\r
Character[0] = LEFT_ONEOF_DELIMITER;\r
NewStrCat (OptionString[0], Character);\r
StringPtr = GetToken (OneOfOption->Text, Selection->Handle);\r
+ ASSERT (StringPtr != NULL);\r
NewStrCat (OptionString[0], StringPtr);\r
Character[0] = RIGHT_ONEOF_DELIMITER;\r
NewStrCat (OptionString[0], Character);\r
Character[0] = LEFT_ONEOF_DELIMITER;\r
NewStrCat (OptionString[0], Character);\r
StringPtr = GetToken (OneOfOption->Text, Selection->Handle);\r
+ ASSERT (StringPtr != NULL);\r
NewStrCat (OptionString[0], StringPtr);\r
Character[0] = RIGHT_ONEOF_DELIMITER;\r
NewStrCat (OptionString[0], Character);\r
VARIABLE_POINTER_TRACK Variable;\r
UINTN VarDataSize;\r
EFI_STATUS Status;\r
+ UINT8 *VariableDataPtr;\r
\r
if (VariableName == NULL || VendorGuid == NULL || DataSize == NULL) {\r
return EFI_INVALID_PARAMETER;\r
Status = EFI_INVALID_PARAMETER;\r
goto Done;\r
}\r
-\r
- CopyMem (Data, GetVariableDataPtr (Variable.CurrPtr), VarDataSize);\r
+ VariableDataPtr = GetVariableDataPtr (Variable.CurrPtr);\r
+ ASSERT (VariableDataPtr != NULL);\r
+ \r
+ CopyMem (Data, VariableDataPtr, VarDataSize);\r
if (Attributes != NULL) {\r
*Attributes = Variable.CurrPtr->Attributes;\r
}\r