diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c index 16fd793c12..476c8b39ad 100644 --- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c +++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c @@ -544,6 +544,7 @@ CoreDispatcher ( &DriverEntry->ImageHandle, sizeof (DriverEntry->ImageHandle) ); + ASSERT (DriverEntry->ImageHandle != NULL); Status = CoreStartImage (DriverEntry->ImageHandle, NULL, NULL); diff --git a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c index 27e9f9e0b1..f44310f8ef 100644 --- a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c +++ b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c @@ -640,6 +640,7 @@ CoreProcessFirmwareVolume ( // somehow. // if (!EFI_ERROR(Status)) { + ASSERT (*FVProtocolHandle != NULL); Ptr = NULL; Status = CoreHandleProtocol (*FVProtocolHandle, &gEfiFirmwareVolume2ProtocolGuid, (VOID **) &Ptr); if (EFI_ERROR(Status) || (Ptr == NULL)) { diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c index 331f9d8d22..0853f98767 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c @@ -403,6 +403,7 @@ IScsiReceiveLoginRsp ( // // A Login Response is received, process it. // + ASSERT (Pdu != NULL); Status = IScsiProcessLoginRsp (Conn, Pdu); NetbufFree (Pdu);