From 4ac4deb706fcd6595d5ee96a3b322f37026561a3 Mon Sep 17 00:00:00 2001
From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 11 Jun 2010 07:47:06 +0000
Subject: Add more check to make sure code run safely.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10574 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Foundation/Library/Dxe/Graphics/Graphics.c     |  6 ++++--
 .../Foundation/Library/Dxe/Graphics/Print.c        | 25 +++++++++++++---------
 .../Library/Dxe/Graphics/Unicode/Sprint.c          |  8 +++----
 3 files changed, 23 insertions(+), 16 deletions(-)

(limited to 'EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics')

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.c
index e913d592e2..6a8183e131 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -436,11 +436,13 @@ Returns:
   if (GraphicsOutput != NULL) {
     SizeOfX = GraphicsOutput->Mode->Info->HorizontalResolution;
     SizeOfY = GraphicsOutput->Mode->Info->VerticalResolution;
-  } else {
+  } else if (UgaDraw != NULL) {
     Status = UgaDraw->GetMode (UgaDraw, &SizeOfX, &SizeOfY, &ColorDepth, &RefreshRate);
     if (EFI_ERROR (Status)) {
       return EFI_UNSUPPORTED;
     }
+  } else {
+    return EFI_UNSUPPORTED;
   }
 
   Instance = 0;
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c
index 316fe71e23..03b66623c9 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -158,8 +158,7 @@ Arguments:
 
 Returns: 
 
-  EFI_SUCCESS             -  success
-  EFI_OUT_OF_RESOURCES    -  out of resources
+  Length of string printed to the console
 
 --*/
 {
@@ -191,7 +190,7 @@ Returns:
   //
   Buffer = EfiLibAllocateZeroPool (0x10000);
   if (Buffer == NULL) {
-    return EFI_OUT_OF_RESOURCES;
+    return 0;
   }
 
   if (GraphicsOutput != NULL) {
@@ -371,10 +370,15 @@ Error:
   EfiLibSafeFreePool (Blt);
   EfiLibSafeFreePool (FontInfo);
 #else
-  gBS->FreePool (LineBuffer);
+  EfiLibSafeFreePool (LineBuffer);
 #endif  
   gBS->FreePool (Buffer);
-  return Status;
+  
+  if (EFI_ERROR (Status)) {
+    return 0;
+  }
+
+  return BufferLen;
 }
 
 
@@ -440,19 +444,20 @@ Returns:
                     (VOID**)&UgaDraw
                     );
 
-    if (EFI_ERROR (Status)) {
-      return Status;
+    if (EFI_ERROR (Status) || (UgaDraw == NULL)) {
+      return 0;
     }
   }
 
+  Sto = NULL;
   Status = gBS->HandleProtocol (
                   Handle,
                   &gEfiSimpleTextOutProtocolGuid,
                   (VOID**)&Sto
                   );
 
-  if (EFI_ERROR (Status)) {
-    return Status;
+  if (EFI_ERROR (Status) || (Sto == NULL)) {
+    return 0;
   }
 
   return _IPrint (GraphicsOutput, UgaDraw, Sto, X, Y, ForeGround, BackGround, Fmt, Args);
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Unicode/Sprint.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Unicode/Sprint.c
index 3eb6c85b8a..de99ee07ea 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Unicode/Sprint.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Unicode/Sprint.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -123,8 +123,8 @@ Returns:
 --*/
 {
   UINTN   Index;
-  CHAR16  UnicodeFormat[EFI_DRIVER_LIB_MAX_PRINT_BUFFER];
-  CHAR16  UnicodeResult[EFI_DRIVER_LIB_MAX_PRINT_BUFFER];
+  CHAR16  UnicodeFormat[EFI_DRIVER_LIB_MAX_PRINT_BUFFER+1];
+  CHAR16  UnicodeResult[EFI_DRIVER_LIB_MAX_PRINT_BUFFER+1];
 
   for (Index = 0; Index < EFI_DRIVER_LIB_MAX_PRINT_BUFFER && FormatString[Index] != '\0'; Index++) {
     UnicodeFormat[Index] = (CHAR16) FormatString[Index];
@@ -132,7 +132,7 @@ Returns:
 
   UnicodeFormat[Index]  = '\0';
 
-  Index                 = VSPrint (UnicodeResult, EFI_DRIVER_LIB_MAX_PRINT_BUFFER, UnicodeFormat, Marker);
+  Index                 = VSPrint (UnicodeResult, sizeof (UnicodeResult), UnicodeFormat, Marker);
 
   for (Index = 0; (Index < (BufferSize - 1)) && UnicodeResult[Index] != '\0'; Index++) {
     Buffer[Index] = (CHAR8) UnicodeResult[Index];
-- 
cgit v1.2.3