From 4e91fa5f6b82109540ae16b7ed1db86e27f43394 Mon Sep 17 00:00:00 2001
From: Thomas Faller <tfaller1@gmx.de>
Date: Sun, 14 Jun 2015 21:40:26 +0200
Subject: [PATCH] cmd: Fix invalid memory access.

---
 programs/cmd/wcmdmain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 36d2ec1588..1e42c47777 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1330,7 +1330,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects,
  *	Changing default drive has to be handled as a special case.
  */
 
-    if ((cmd[1] == ':') && IsCharAlphaW(cmd[0]) && (strlenW(cmd) == 2)) {
+    if ((strlenW(cmd) == 2) && (cmd[1] == ':') && IsCharAlphaW(cmd[0])) {
       WCHAR envvar[5];
       WCHAR dir[MAX_PATH];