Index: ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
===================================================================
--- ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c	(revision 16034)
+++ ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c	(working copy)
@@ -618,7 +618,7 @@
       goto ON_ERROR;
     }
     if (ConfigHdr != NULL) {
-      StrnCpy (ConfigResp, ConfigHdr, Length + NIC_ITEM_CONFIG_SIZE * 2 + 100);
+      StrnCpy (ConfigResp, ConfigHdr, Length + NIC_ITEM_CONFIG_SIZE * 2 + 100 - 1);
     }
  
     //
@@ -791,7 +791,7 @@
     goto ON_EXIT;
   }
   if (ConfigHdr != NULL) {
-    StrnCpy (ConfigResp, ConfigHdr, Length + NIC_ITEM_CONFIG_SIZE * 2 + 100);
+    StrnCpy (ConfigResp, ConfigHdr, Length + NIC_ITEM_CONFIG_SIZE * 2 + 100 - 1);
   }
 
   NicConfig = AllocateZeroPool (NIC_ITEM_CONFIG_SIZE);