Index: Application/Shell/ShellParametersProtocol.c
===================================================================
--- Application/Shell/ShellParametersProtocol.c	(revision 15837)
+++ Application/Shell/ShellParametersProtocol.c	(working copy)
@@ -85,7 +85,11 @@
       StrCpy(*TempParameter, L"");
       *Walker = NextDelim + 1;
     } else if (NextDelim != NULL) {
-      StrnCpy(*TempParameter, (*Walker)+1, NextDelim - ((*Walker)+1));
+
+      //
+      // Copy ensuring that both quotes are left in place.
+      //
+      StrnCpy(*TempParameter, (*Walker), NextDelim - *Walker + 2);
       *Walker = NextDelim + 1;
     } else {
       //