Index: Application/Shell/FileHandleWrappers.c
===================================================================
--- Application/Shell/FileHandleWrappers.c	(revision 16063)
+++ Application/Shell/FileHandleWrappers.c	(working copy)
@@ -1140,6 +1140,7 @@
   )
 {
   EFI_FILE_PROTOCOL_ENVIRONMENT  *EnvFileInterface;
+  UINTN                          EnvNameSize;
 
   if (EnvName == NULL) {
     return (NULL);
@@ -1167,7 +1168,8 @@
   EnvFileInterface->Delete      = FileInterfaceEnvDelete;
   EnvFileInterface->Read        = FileInterfaceEnvRead;
 
-  StrnCpy(EnvFileInterface->Name, EnvName, StrLen(EnvName));
+  EnvNameSize = StrSize(EnvName);
+  CopyMem(EnvFileInterface->Name, EnvName, EnvNameSize);
 
   //
   // Assign the different members for Volatile and Non-Volatile variables