From 5410502f6d7e4bb786ccd6c30c8662ed217bcaba Mon Sep 17 00:00:00 2001 From: Star Zeng Date: Wed, 11 Jul 2018 16:35:02 +0800 Subject: [PATCH] MdeModulePkg CapsuleApp: Check Arg count for -P GET option Also add help info for CapsuleApp -P GET option. Cc: Michael D Kinney Cc: Jiewen Yao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Star Zeng Reviewed-by: Jiewen Yao --- .../Application/CapsuleApp/CapsuleApp.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c index e9be39fd71..80b66bc6f3 100644 --- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c +++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c @@ -740,7 +740,8 @@ PrintUsage ( Print(L" which is defined in UEFI specification.\n"); Print(L" -C: Clear capsule report variable (EFI_CAPSULE_REPORT_GUID),\n"); Print(L" which is defined in UEFI specification.\n"); - Print(L" -P: Dump UEFI FMP protocol info.\n"); + Print(L" -P: Dump UEFI FMP protocol info, or get image with specified\n"); + Print(L" ImageTypeId and index to a file if 'GET' option is used.\n"); Print(L" -E: Dump UEFI ESRT table info.\n"); Print(L" -G: Convert a BMP file to be an UX capsule,\n"); Print(L" according to Windows Firmware Update document\n"); @@ -820,7 +821,15 @@ UefiMain ( DumpFmpData(); } if (Argc >= 3) { - if (StrCmp(Argv[2], L"GET") == 0) { + if (StrCmp(Argv[2], L"GET") != 0) { + Print(L"CapsuleApp: Unrecognized option(%s).\n", Argv[2]); + return EFI_UNSUPPORTED; + } else { + if (Argc != 7) { + Print(L"CapsuleApp: Incorrect parameter count.\n"); + return EFI_UNSUPPORTED; + } + EFI_GUID ImageTypeId; UINTN ImageIndex; // @@ -832,9 +841,11 @@ UefiMain ( return EFI_INVALID_PARAMETER; } ImageIndex = StrDecimalToUintn(Argv[4]); - if (StrCmp(Argv[5], L"-O") == 0) { - DumpFmpImage(&ImageTypeId, ImageIndex, Argv[6]); + if (StrCmp(Argv[5], L"-O") != 0) { + Print(L"CapsuleApp: NO output file name.\n"); + return EFI_UNSUPPORTED; } + DumpFmpImage(&ImageTypeId, ImageIndex, Argv[6]); } } return EFI_SUCCESS; -- 2.39.2