Changeset 85718 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/FileHandleWrappers.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/FileHandleWrappers.c (modified) (6 diffs)

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

@@ -518 +518 @@
 
   //
-  // Limit the line length to the buffer size or the minimun size of the
+  // Limit the line length to the buffer size or the minimum size of the
   // screen. (The smaller takes effect)
   //
@@ -866 +866 @@
       if (Key.UnicodeChar != CHAR_BACKSPACE && !(Key.UnicodeChar == 0 && Key.ScanCode == SCAN_DELETE)) {
         //
-        // Calulate row and column of the tail of current string
+        // Calculate row and column of the tail of current string
         //
         TailRow     = Row + (StringLen - StringCurPos + Column + OutputLength) / TotalColumn;
@@ -933 +933 @@
 
 //
-// FILE sytle interfaces for StdIn/StdOut/StdErr
+// FILE style interfaces for StdIn/StdOut/StdErr
 //
 EFI_FILE_PROTOCOL FileInterfaceStdIn = {
@@ -1070 +1070 @@
         ((CHAR16*)NewBuffer)[TotalSize / sizeof (CHAR16) - 3] = CHAR_NULL;
         //
-        // If the NewBuffer end with \r\n\0, We will repace '\r' by '\0' and then update TotalSize.
+        // If the NewBuffer end with \r\n\0, We will replace '\r' by '\0' and then update TotalSize.
         //
         TotalSize -= sizeof(CHAR16) * 2;
@@ -1645 +1645 @@
     if ((UINTN)(MemFile->Position + (*BufferSize)) > (UINTN)(MemFile->BufferSize)) {
       MemFile->Buffer = ReallocatePool((UINTN)(MemFile->BufferSize), (UINTN)(MemFile->BufferSize) + (*BufferSize) + MEM_WRITE_REALLOC_OVERHEAD, MemFile->Buffer);
+      if (MemFile->Buffer == NULL){
+        return EFI_OUT_OF_RESOURCES;
+      }
       MemFile->BufferSize += (*BufferSize) + MEM_WRITE_REALLOC_OVERHEAD;
     }
@@ -1662 +1665 @@
     if ((UINTN)(MemFile->Position + AsciiStrSize(AsciiBuffer)) > (UINTN)(MemFile->BufferSize)) {
       MemFile->Buffer = ReallocatePool((UINTN)(MemFile->BufferSize), (UINTN)(MemFile->BufferSize) + AsciiStrSize(AsciiBuffer) + MEM_WRITE_REALLOC_OVERHEAD, MemFile->Buffer);
+      if (MemFile->Buffer == NULL){
+        FreePool(AsciiBuffer);
+        return EFI_OUT_OF_RESOURCES;
+      }
       MemFile->BufferSize += AsciiStrSize(AsciiBuffer) + MEM_WRITE_REALLOC_OVERHEAD;
     }