Add Pointer check for NULL before referring it and remove unnecessary pointer check...

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

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
index 3e135d74ec60068882c30d3a323faf88fb77ba6c..526590718aa0e43fe2f2496103c7f6052eaed7ee 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
@@ -794,7 +794,7 @@ ErrorExit:
            );\r
   }\r
 \r
            );\r
   }\r
 \r

-  if (Instance->TimerEvent != NULL) {\r
+  if ((Instance != NULL) && (Instance->TimerEvent != NULL)) {\r

     gBS->CloseEvent (Instance->TimerEvent);\r
   }\r
 \r
     gBS->CloseEvent (Instance->TimerEvent);\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
index 7d194daaeab6fbd74c04b496f8e6e48e1e667d26..9de8312caec248afa01f30d430ef1172248c5c04 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
@@ -457,13 +457,8 @@ PartitionDriverBindingStop (
            EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
            ); \r
 \r
            EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
            ); \r
 \r

-    if (BlockIo != NULL) {\r
-      Private = PARTITION_DEVICE_FROM_BLOCK_IO_THIS (BlockIo);\r
-    } else if (BlockIo2 != NULL) {\r
-      Private = PARTITION_DEVICE_FROM_BLOCK_IO2_THIS (BlockIo2);\r
-    } else {\r
-      ASSERT (FALSE);\r
-    }\r
+\r
+    Private = PARTITION_DEVICE_FROM_BLOCK_IO_THIS (BlockIo);\r

 \r
     Status = gBS->CloseProtocol (\r
                     ControllerHandle,\r
 \r
     Status = gBS->CloseProtocol (\r
                     ControllerHandle,\r


@@ -1008,19 +1003,22 @@ PartitionInstallChildHandle (
   Private->ParentBlockIo2   = ParentBlockIo2;\r
   Private->DiskIo           = ParentDiskIo;\r
 \r
   Private->ParentBlockIo2   = ParentBlockIo2;\r
   Private->DiskIo           = ParentDiskIo;\r
 \r

-  if (Private->ParentBlockIo != NULL) {\r
-    Private->BlockIo.Revision = ParentBlockIo->Revision;\r
-\r
-    Private->BlockIo.Media    = &Private->Media;\r
-    CopyMem (Private->BlockIo.Media, ParentBlockIo->Media, sizeof (EFI_BLOCK_IO_MEDIA));\r
-\r
+  //\r
+  // Set the BlockIO into Private Data.\r
+  //\r
+  Private->BlockIo.Revision = ParentBlockIo->Revision;\r
+  \r
+  Private->BlockIo.Media    = &Private->Media;\r
+  CopyMem (Private->BlockIo.Media, ParentBlockIo->Media, sizeof (EFI_BLOCK_IO_MEDIA));\r

 \r
 \r

-    Private->BlockIo.Reset        = PartitionReset;\r
-    Private->BlockIo.ReadBlocks   = PartitionReadBlocks;\r
-    Private->BlockIo.WriteBlocks  = PartitionWriteBlocks;\r
-    Private->BlockIo.FlushBlocks  = PartitionFlushBlocks;\r
-  }\r
+  Private->BlockIo.Reset        = PartitionReset;\r
+  Private->BlockIo.ReadBlocks   = PartitionReadBlocks;\r
+  Private->BlockIo.WriteBlocks  = PartitionWriteBlocks;\r
+  Private->BlockIo.FlushBlocks  = PartitionFlushBlocks;\r

 \r
 \r

+  //\r
+  // Set the BlockIO2 into Private Data.\r
+  //\r

   if (Private->ParentBlockIo2 != NULL) {\r
     Private->BlockIo2.Media    = &Private->Media2;\r
     CopyMem (Private->BlockIo2.Media, ParentBlockIo2->Media, sizeof (EFI_BLOCK_IO_MEDIA));\r
   if (Private->ParentBlockIo2 != NULL) {\r
     Private->BlockIo2.Media    = &Private->Media2;\r
     CopyMem (Private->BlockIo2.Media, ParentBlockIo2->Media, sizeof (EFI_BLOCK_IO_MEDIA));\r


@@ -1036,7 +1034,7 @@ PartitionInstallChildHandle (
   Private->Media.LastBlock = DivU64x32 (\r
                                MultU64x32 (\r
                                  End - Start + 1,\r
   Private->Media.LastBlock = DivU64x32 (\r
                                MultU64x32 (\r
                                  End - Start + 1,\r

-                                 (ParentBlockIo != NULL) ? ParentBlockIo->Media->BlockSize : ParentBlockIo2->Media->BlockSize\r
+                                 ParentBlockIo->Media->BlockSize\r

                                  ),\r
                                 BlockSize\r
                                ) - 1;\r
                                  ),\r
                                 BlockSize\r
                                ) - 1;\r


@@ -1085,8 +1083,7 @@ PartitionInstallChildHandle (
   // here.\r
   //\r
   Private->Handle = NULL;\r
   // here.\r
   //\r
   Private->Handle = NULL;\r

-  if ((Private->ParentBlockIo != NULL) &&\r
-      (Private->ParentBlockIo2 != NULL) &&\r
+  if ((Private->ParentBlockIo2 != NULL) &&\r

       (Private->ParentBlockIo2->Media->BlockSize == BlockSize)\r
      ) {\r
     Status = gBS->InstallMultipleProtocolInterfaces (\r
       (Private->ParentBlockIo2->Media->BlockSize == BlockSize)\r
      ) {\r
     Status = gBS->InstallMultipleProtocolInterfaces (\r


@@ -1101,33 +1098,17 @@ PartitionInstallChildHandle (
                     NULL,\r
                     NULL\r
                     );\r
                     NULL,\r
                     NULL\r
                     );\r

-  } else {\r
-    if (Private->ParentBlockIo != NULL) {\r
-      Status = gBS->InstallMultipleProtocolInterfaces (\r
-                      &Private->Handle,\r
-                      &gEfiDevicePathProtocolGuid,\r
-                      Private->DevicePath,\r
-                      &gEfiBlockIoProtocolGuid,\r
-                      &Private->BlockIo,\r
-                      Private->EspGuid,\r
-                      NULL,\r
-                      NULL\r
-                      );\r
-    }\r
-    if (Private->ParentBlockIo2 != NULL && \r
-        Private->ParentBlockIo2->Media->BlockSize == BlockSize\r
-       ) {\r
-      Status = gBS->InstallMultipleProtocolInterfaces (\r
-                      &Private->Handle,\r
-                      &gEfiDevicePathProtocolGuid,\r
-                      Private->DevicePath,\r
-                      &gEfiBlockIo2ProtocolGuid,\r
-                      &Private->BlockIo2,\r
-                      Private->EspGuid,\r
-                      NULL,\r
-                      NULL\r
-                      );\r
-    }\r
+  } else {    \r
+    Status = gBS->InstallMultipleProtocolInterfaces (\r
+                    &Private->Handle,\r
+                    &gEfiDevicePathProtocolGuid,\r
+                    Private->DevicePath,\r
+                    &gEfiBlockIoProtocolGuid,\r
+                    &Private->BlockIo,\r
+                    Private->EspGuid,\r
+                    NULL,\r
+                    NULL\r
+                    );\r

   }\r
 \r
   if (!EFI_ERROR (Status)) {\r
   }\r
 \r
   if (!EFI_ERROR (Status)) {\r