diff options
| author | jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-04-13 23:37:21 +0000 |
|---|---|---|
| committer | jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-04-13 23:37:21 +0000 |
| commit | eef1ed4638011dc2d15f3f613c3e720c382fd294 (patch) | |
| tree | 9389f91a523e7ffdffe4f6d1333ee3f15f68aec7 | |
| parent | a49016b117dceddc8b44fe3e5e4e3623cee133e5 (diff) | |
| download | edk2-platforms-eef1ed4638011dc2d15f3f613c3e720c382fd294.tar.xz | |
rm - refine user input validation to prevent removal of CWD.
change colors of "set" command output.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11538 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c | 44 | ||||
| -rw-r--r-- | ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.uni | bin | 111268 -> 111268 bytes |
2 files changed, 34 insertions, 10 deletions
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c index ea3792a3be..32b7580103 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c @@ -172,27 +172,51 @@ IsValidDeleteTarget( )
{
CONST CHAR16 *TempLocation;
- CHAR16 *Temp2;
+ BOOLEAN RetVal;
+ CHAR16 *SearchString;
+ CHAR16 *Pattern;
UINTN Size;
+ if (Node == NULL || Node->FullName == NULL) {
+ return (FALSE);
+ }
+
TempLocation = StrStr(Node->FullName, L":");
- if (StrLen(TempLocation) == 2) {
+ if (StrLen(TempLocation) <= 2) {
//
// Deleting the root directory is invalid.
//
return (FALSE);
}
+
TempLocation = ShellGetCurrentDir(NULL);
- Size = 0;
- Temp2 = NULL;
- StrnCatGrow(&Temp2, &Size, TempLocation, 0);
- if (StrStr(Temp2, Node->FullName) != NULL) {
- FreePool(Temp2);
- return (FALSE);
+ if (TempLocation == NULL) {
+ //
+ // No working directory is specified so whatever is left is ok.
+ //
+ return (TRUE);
}
- FreePool(Temp2);
- return (TRUE);
+ Pattern = NULL;
+ SearchString = NULL;
+ Size = 0;
+ Pattern = StrnCatGrow(&Pattern , NULL, TempLocation , 0);
+ SearchString = StrnCatGrow(&SearchString, &Size, Node->FullName, 0);
+ SearchString = StrnCatGrow(&SearchString, &Size, L"*", 0);
+
+ if (Pattern == NULL || SearchString == NULL) {
+ RetVal = FALSE;
+ } else {
+ RetVal = TRUE;
+ if (gUnicodeCollation->MetaiMatch(gUnicodeCollation, Pattern, SearchString)) {
+ RetVal = FALSE;
+ }
+ }
+
+ SHELL_FREE_NON_NULL(Pattern );
+ SHELL_FREE_NON_NULL(SearchString);
+
+ return (RetVal);
}
/**
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.uni b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.uni Binary files differindex 428d8ddaec..eaa7b2ba8f 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.uni +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.uni |