From ecae51177e83db0d99f8b4888ae4b866c18651b6 Mon Sep 17 00:00:00 2001 From: jcarsey Date: Mon, 10 Oct 2011 20:32:17 +0000 Subject: ShellPkg: Add checks for NULL pointers. This adds lots of pointer verification with ASSERTs only used when the condition should be impossible and never for memory allocation. signed-off-by: jcarsey reviewed-by: geekboy15a git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12523 6f19259b-4bc3-4df7-8a09-765794883524 --- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ShellPkg/Library/UefiHandleParsingLib') diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c index 77f7756dc7..9e51648217 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c @@ -206,8 +206,10 @@ TxtOutProtocolDumpInformation( RetVal = AllocateZeroPool(Size); Temp = HiiGetString(mHandleParsingHiiHandle, STRING_TOKEN(STR_TXT_OUT_DUMP_HEADER), NULL); - UnicodeSPrint(RetVal, Size, Temp, Dev, Dev->Mode->Attribute); - FreePool(Temp); + if (Temp != NULL) { + UnicodeSPrint(RetVal, Size, Temp, Dev, Dev->Mode->Attribute); + FreePool(Temp); + } // // Dump TextOut Info @@ -219,7 +221,7 @@ TxtOutProtocolDumpInformation( UnicodeSPrint( RetVal + StrLen(RetVal), NewSize, - Temp, + Temp == NULL?L"":Temp, Index == Dev->Mode->Mode ? L'*' : L' ', Index, !EFI_ERROR(Status)?Col:-1, -- cgit v1.2.3