From 45ac3433b58fb87cf63960cf3f1492b22df0d255 Mon Sep 17 00:00:00 2001 From: Qiu Shumin Date: Fri, 18 Dec 2015 07:32:17 +0000 Subject: ShellPkg: Refine code by initializing local variable and adding ASSERT statement. Add ASSERT statement and initialize local variable to make code more readable. (Sync patch r18689 from main trunk.) Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin Reviewed-by: Jaben Carsey git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19398 6f19259b-4bc3-4df7-8a09-765794883524 --- ShellPkg/Application/Shell/ShellProtocol.c | 2 ++ ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c | 1 + 2 files changed, 3 insertions(+) diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c index af00fe401d..fc13595dbb 100644 --- a/ShellPkg/Application/Shell/ShellProtocol.c +++ b/ShellPkg/Application/Shell/ShellProtocol.c @@ -1632,6 +1632,8 @@ EfiShellExecute( EFI_DEVICE_PATH_PROTOCOL *DevPath; UINTN Size; EFI_STATUS CalleeStatusCode; + + CalleeStatusCode = EFI_SUCCESS; if ((PcdGet8(PcdShellSupportLevel) < 1)) { return (EFI_UNSUPPORTED); diff --git a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c index 02099febef..831b9c3d02 100644 --- a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c +++ b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c @@ -341,6 +341,7 @@ ShellCommandRunTftp ( } RemoteFilePath = ShellCommandLineGetRawValue (CheckPackage, 2); + ASSERT(RemoteFilePath != NULL); AsciiRemoteFilePath = AllocatePool ( (StrLen (RemoteFilePath) + 1) * sizeof (CHAR8) ); -- cgit v1.2.3