From 1b2bf3cadcd1beac1ad0da61bc8142e00aa848ed Mon Sep 17 00:00:00 2001
From: xdu2 <xdu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 5 Feb 2010 06:13:18 +0000
Subject: [PATCH] Add some security check.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9934 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Universal/HiiDatabaseDxe/Font.c                 | 5 +++--
 .../Universal/Network/VlanConfigDxe/VlanConfigImpl.c         | 3 +--
 MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c            | 1 +
 MdeModulePkg/Universal/SetupBrowserDxe/Setup.c               | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
index 2fd355029d..0ed8169bed 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
@@ -2,7 +2,7 @@
 Implementation for EFI_HII_FONT_PROTOCOL.
 
 
-Copyright (c) 2007 - 2009, Intel Corporation
+Copyright (c) 2007 - 2010, Intel Corporation
 All rights reserved. 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
@@ -2392,6 +2392,7 @@ HiiGetGlyph (
     if (EFI_ERROR (Status)) {
       goto Exit;
     }
+    ASSERT (StringInfoOut != NULL);
     FontInfo   = &StringInfoOut->FontInfo;
     Foreground = StringInfoOut->ForegroundColor;
     Background = StringInfoOut->BackgroundColor;
@@ -2622,7 +2623,7 @@ HiiGetFontInfo (
     InfoOut.BackgroundColor = SystemDefault->BackgroundColor;
   }
   
-
+  ASSERT (FontInfo != NULL);
   FontInfo->FontSize  = InfoOut.FontInfo.FontSize;
   FontInfo->FontStyle = InfoOut.FontInfo.FontStyle;
 
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
index 54d317416d..b11e7c96d5 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
@@ -480,8 +480,7 @@ InstallVlanConfigForm (
   PrivateData->MacString = MacString;
 
   StrCpy (Str, L"VLAN Configuration (MAC:");
-  ASSERT (StrLen (MacString) <= (sizeof (EFI_MAC_ADDRESS) * 2));
-  StrCat (Str, MacString);
+  StrnCat (Str, MacString, sizeof (EFI_MAC_ADDRESS) * 2);
   StrCat (Str, L")");
   HiiSetString (
     HiiHandle,
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index 8a53c63a50..02684e46ca 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -1505,6 +1505,7 @@ ParseOpCodes (
       //
       // Now we know the Storage width of nested Ordered List
       //
+      ASSERT (CurrentStatement != NULL);
       if ((CurrentStatement->Operand == EFI_IFR_ORDERED_LIST_OP) && (CurrentStatement->BufferValue == NULL)) {
         Width = 1;
         switch (CurrentOption->Value.Type) {
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index ab98ada1c8..81de737a03 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -1138,11 +1138,13 @@ GetQuestionValue (
       //
       CopyMem (Dst, Storage->EditBuffer + Question->VarStoreInfo.VarOffset, StorageWidth);
     } else {
+      Value = NULL;
       Status = GetValueByName (Storage, Question->VariableName, &Value);
       if (EFI_ERROR (Status)) {
         return Status;
       }
 
+      ASSERT (Value != NULL);
       LengthStr = StrLen (Value);
       Status    = EFI_SUCCESS;
       if (IsString) {
-- 
2.39.2