Index: Application/Shell/ShellParametersProtocol.c
===================================================================
--- Application/Shell/ShellParametersProtocol.c	(revision 14788)
+++ Application/Shell/ShellParametersProtocol.c	(working copy)
@@ -313,9 +313,7 @@
     FullCommandLine = AllocateZeroPool(Size);
   }
   if (FullCommandLine != NULL) {
-    if (LoadedImage->LoadOptionsSize != 0){
-      StrCpy(FullCommandLine, LoadedImage->LoadOptions);
-    }
+    CopyMem (FullCommandLine, LoadedImage->LoadOptions, LoadedImage->LoadOptionsSize);
     //
     // Populate Argc and Argv
     //