Changeset 85718 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/ShellManParser.c

Timestamp:

Aug 12, 2020 4:09:12 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139865

Message:

Devices/EFI: Merge edk-stable202005 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• ShellPkg/Application/Shell/ShellManParser.c (modified) (6 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/ShellManParser.c

@@ -180 +180 @@
 
 /**
-  parses through the MAN file specified by SHELL_FILE_HANDLE and returns the
-  detailed help for any sub section specified in the comma seperated list of
+  Parses through the MAN file specified by SHELL_FILE_HANDLE and returns the
+  detailed help for any sub section specified in the comma separated list of
   sections provided.  If the end of the file or a .TH section is found then
   return.
 
-  Upon a sucessful return the caller is responsible to free the memory in *HelpText
+  Upon a successful return the caller is responsible to free the memory in *HelpText
 
   @param[in] Handle             FileHandle to read from
@@ -194 +194 @@
 
   @retval EFI_OUT_OF_RESOURCES  a memory allocation failed.
-  @retval EFI_SUCCESS           the section was found and its description sotred in
-                                an alloceted buffer.
+  @retval EFI_SUCCESS           the section was found and its description stored in
+                                an allocated buffer.
 **/
 EFI_STATUS
@@ -297 +297 @@
   Parses a line from a MAN file to see if it is the Title Header. If it is, then
   if the "Brief Description" is desired, allocate a buffer for it and return a
-  copy. Upon a sucessful return the caller is responsible to free the memory in
+  copy. Upon a successful return the caller is responsible to free the memory in
   *BriefDesc
 
   Uses a simple state machine that allows "unlimited" whitespace before and after the
-  ".TH", compares Command and the MAN file commnd name without respect to case, and
+  ".TH", compares Command and the MAN file command name without respect to case, and
   allows "unlimited" whitespace and '0' and '1' characters before the Short Description.
   The PCRE regex describing this functionality is: ^\s*\.TH\s+(\S)\s[\s01]*(.*)$
@@ -422 +422 @@
 
 /**
-  parses through the MAN file specified by SHELL_FILE_HANDLE and returns the
+  Parses through the MAN file specified by SHELL_FILE_HANDLE and returns the
   "Brief Description" for the .TH section as specified by Command.  If the
   command section is not found return EFI_NOT_FOUND.
 
-  Upon a sucessful return the caller is responsible to free the memory in *BriefDesc
+  Upon a successful return the caller is responsible to free the memory in *BriefDesc
 
   @param[in] Handle              FileHandle to read from
@@ -513 +513 @@
   available will be returned.
 
-  if BriefDesc is NULL, then the breif description will not be savedd seperatly,
+  if BriefDesc is NULL, then the breif description will not be saved separately,
   but placed first in the main HelpText.
 
@@ -646 +646 @@
     Status      = gBS->LoadImage(FALSE, gImageHandle, DevPath, NULL, 0, &CmdFileImgHandle);
     if(EFI_ERROR(Status)) {
+      //
+      // With EFI_SECURITY_VIOLATION retval, the Image was loaded and an ImageHandle was created
+      // with a valid EFI_LOADED_IMAGE_PROTOCOL, but the image can not be started right now.
+      // If the caller doesn't have the option to defer the execution of an image, we should
+      // unload image for the EFI_SECURITY_VIOLATION to avoid the resource leak.
+      //
+      if (Status == EFI_SECURITY_VIOLATION) {
+        gBS->UnloadImage (CmdFileImgHandle);
+      }
       *HelpText = NULL;
       goto Done;