From 99ab5fc36c544e0b6294bcf40dcada5d76ac2792 Mon Sep 17 00:00:00 2001
From: Jaben Carsey <jaben.carsey@intel.com>
Date: Fri, 29 Aug 2014 21:57:42 +0000
Subject: This patch replaces StrCpy with StrnCpy or refactors out the usage of
 StrCpy through some other means. This patch replaces StrCat with StrnCat or
 refactors out the usage of StrCat through some other means.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16004 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Library/UefiShellDebug1CommandsLib/DmpStore.c     |  2 +-
 .../SmbiosView/QueryTable.c                           | 19 +++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
index 0eee944ed4..e8c2904823 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
@@ -406,7 +406,7 @@ CascadeProcessVariables (
     FoundVarName = AllocateZeroPool (NameSize);
     if (FoundVarName != NULL) {
       if (PrevName != NULL) {
-        StrCpy(FoundVarName, PrevName);
+        StrnCpy(FoundVarName, PrevName, NameSize/sizeof(CHAR16)-1);
       }
 
       Status = gRT->GetNextVariableName (&NameSize, FoundVarName, &FoundVarGuid);
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index be8b7c6c53..700592d263 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
@@ -2,7 +2,7 @@
   Build a table, each item is (Key, Info) pair.
   And give a interface of query a string out of a table.
 
-  Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2005 - 2014, 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
@@ -3214,25 +3214,20 @@ QueryTable (
   for (Index = 0; Index < Number; Index++) {
     High  = (UINT8) (Table[Index].Key >> 8);
     Low   = (UINT8) (Table[Index].Key & 0x00FF);
+
     //
     // Check if Key is in the range
+    // or if Key == Value in the table
     //
-    if (High > Low && Key >= Low && Key <= High) {
-      StrnCpy (Info, Table[Index].Info, InfoLen-1);
-      StrnCat (Info, L"\n", InfoLen - StrLen(Info));
-      return Key;
-    }
-    //
-    // Check if Key == Value in the table
-    //
-    if (Table[Index].Key == Key) {
+    if ((High > Low && Key >= Low && Key <= High) 
+      || (Table[Index].Key == Key)) {
       StrnCpy (Info, Table[Index].Info, InfoLen-1);
-      StrnCat (Info, L"\n", InfoLen - StrLen(Info));
+      StrnCat (Info, L"\n", InfoLen - 1 - StrLen(Info));
       return Key;
     }
   }
 
-  StrnCpy (Info, L"Undefined Value\n", InfoLen);
+  StrnCpy (Info, L"Undefined Value\n", InfoLen - 1);
   return QUERY_TABLE_UNFOUND;
 }
 
-- 
cgit v1.2.3