Sync patch r12472 from main trunk.

Add pointer check for NULL before dereference it.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010@12952 6f19259b-4bc3-4df7-8a09-765794883524

7 files changed, 28 insertions, 5 deletions

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
index 321b2f7040..81969e040e 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
@@ -339,6 +339,7 @@ FindStringBlock (
       for (Index = 0; Index < StringCount; Index++) {

         BlockSize += AsciiStrSize ((CHAR8 *) StringTextPtr);

         if (CurrentStringId == StringId) {

+          ASSERT (BlockType != NULL && StringBlockAddr != NULL && StringTextOffset != NULL);

           *BlockType        = *BlockHdr;

           *StringBlockAddr  = BlockHdr;

           *StringTextOffset = StringTextPtr - BlockHdr;

@@ -361,6 +362,7 @@ FindStringBlock (
       for (Index = 0; Index < StringCount; Index++) {

         BlockSize += AsciiStrSize ((CHAR8 *) StringTextPtr);

         if (CurrentStringId == StringId) {

+          ASSERT (BlockType != NULL && StringBlockAddr != NULL && StringTextOffset != NULL);

           *BlockType        = *BlockHdr;

           *StringBlockAddr  = BlockHdr;

           *StringTextOffset = StringTextPtr - BlockHdr;

@@ -404,6 +406,7 @@ FindStringBlock (
         GetUnicodeStringTextOrSize (NULL, StringTextPtr, &StringSize);

         BlockSize += StringSize;

         if (CurrentStringId == StringId) {

+          ASSERT (BlockType != NULL && StringBlockAddr != NULL && StringTextOffset != NULL);

           *BlockType        = *BlockHdr;

           *StringBlockAddr  = BlockHdr;

           *StringTextOffset = StringTextPtr - BlockHdr;

@@ -427,6 +430,7 @@ FindStringBlock (
         GetUnicodeStringTextOrSize (NULL, StringTextPtr, &StringSize);

         BlockSize += StringSize;

         if (CurrentStringId == StringId) {

+          ASSERT (BlockType != NULL && StringBlockAddr != NULL && StringTextOffset != NULL);

           *BlockType        = *BlockHdr;

           *StringBlockAddr  = BlockHdr;

           *StringTextOffset = StringTextPtr - BlockHdr;

@@ -559,7 +563,7 @@ FindStringBlock (
   //

   // Get last string ID

   //

-  if (StringId == (EFI_STRING_ID) (-1)) {

+  if (StringId == (EFI_STRING_ID) (-1) && LastStringId != NULL) {

     *LastStringId = (EFI_STRING_ID) (CurrentStringId - 1);

     return EFI_SUCCESS;

   }

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
index 8219e01e24..c754177a1f 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
@@ -533,6 +533,8 @@ ArpMatchAddress (
   IN NET_ARP_ADDRESS  *AddressTwo

   )

 {

+  ASSERT (AddressOne != NULL && AddressTwo != NULL);

+

   if ((AddressOne->Type != AddressTwo->Type) ||

     (AddressOne->Length != AddressTwo->Length)) {

     //

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index 75333b82ef..51cbabd099 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
@@ -419,7 +419,15 @@ Ip4Reassemble (
     }

 

     NewPacket->Ip.Ip4 = Assemble->Head;

-    CopyMem (IP4_GET_CLIP_INFO (NewPacket), Assemble->Info, sizeof (*IP4_GET_CLIP_INFO (NewPacket)));

+

+    ASSERT (Assemble->Info != NULL);

+

+    CopyMem (

+      IP4_GET_CLIP_INFO (NewPacket),

+      Assemble->Info,

+      sizeof (*IP4_GET_CLIP_INFO (NewPacket))

+      );

+

     return NewPacket;

   }

 

@@ -1160,7 +1168,9 @@ Ip4InstanceDeliverPacket (
       // headless. Trim the head off after copy. The IP head

       // may be not continuous before the data.

       //

-      Head    = NetbufAllocSpace (Dup, IP4_MAX_HEADLEN, NET_BUF_HEAD);

+      Head = NetbufAllocSpace (Dup, IP4_MAX_HEADLEN, NET_BUF_HEAD);

+      ASSERT (Head != NULL);

+      

       Dup->Ip.Ip4 = (IP4_HEAD *) Head;

 

       CopyMem (Head, Packet->Ip.Ip4, Packet->Ip.Ip4->HeadLen << 2);

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index 8b72d8fb03..41a5f88cba 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -904,6 +904,7 @@ GetSelectionInputPopUp (
       Link = GetNextNode (&Question->OptionListHead, Link);

 

       StringPtr = GetToken (OneOfOption->Text, MenuOption->Handle);

+      ASSERT (StringPtr != NULL);

       //

       // If the string occupies multiple lines, truncate it to fit in one line,

       // and append a "..." for indication.

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index cb2c22fe3e..78d2979ea4 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -522,6 +522,7 @@ DisplayForm (
 

     if (!Suppress) {

       StringPtr = GetToken (Statement->Prompt, Handle);

+      ASSERT (StringPtr != NULL);

 

       Width     = GetWidth (Statement, Handle);

 

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c b/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
index 40071f3bfe..ec8dd71de8 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
@@ -501,6 +501,7 @@ ProcessOptions (
           Character[0] = LEFT_ONEOF_DELIMITER;

           NewStrCat (OptionString[0], Character);

           StringPtr = GetToken (OneOfOption->Text, Selection->Handle);

+          ASSERT (StringPtr != NULL);

           NewStrCat (OptionString[0], StringPtr);

           Character[0] = RIGHT_ONEOF_DELIMITER;

           NewStrCat (OptionString[0], Character);

@@ -598,6 +599,7 @@ ProcessOptions (
         Character[0] = LEFT_ONEOF_DELIMITER;

         NewStrCat (OptionString[0], Character);

         StringPtr = GetToken (OneOfOption->Text, Selection->Handle);

+        ASSERT (StringPtr != NULL);

         NewStrCat (OptionString[0], StringPtr);

         Character[0] = RIGHT_ONEOF_DELIMITER;

         NewStrCat (OptionString[0], Character);

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
index a679a94efa..98c750ae60 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
@@ -1177,6 +1177,7 @@ EmuGetVariable (
   VARIABLE_POINTER_TRACK  Variable;

   UINTN                   VarDataSize;

   EFI_STATUS              Status;

+  UINT8                   *VariableDataPtr;

 

   if (VariableName == NULL || VendorGuid == NULL || DataSize == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -1201,8 +1202,10 @@ EmuGetVariable (
       Status = EFI_INVALID_PARAMETER;

       goto Done;

     }

-

-    CopyMem (Data, GetVariableDataPtr (Variable.CurrPtr), VarDataSize);

+    VariableDataPtr = GetVariableDataPtr (Variable.CurrPtr);

+    ASSERT (VariableDataPtr != NULL);

+    

+    CopyMem (Data, VariableDataPtr, VarDataSize);

     if (Attributes != NULL) {

       *Attributes = Variable.CurrPtr->Attributes;

     }