From 04e0fe0652553b1472d4255fa05f87110b1f1870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sun, 12 Jul 2020 23:27:35 +0200
Subject: [PATCH] [CMD] The "special" environment-like variables are available
 only when extensions are enabled.

The "special" variables are: CD, DATE, TIME, RANDOM,
CMDCMDLINE, CMDEXTVERSION, ERRORLEVEL (and on Win7+,
HIGHESTNUMANODENUMBER).
---
 base/shell/cmd/cmd.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c
index 3a57c04ef33..1cc0a0663f5 100644
--- a/base/shell/cmd/cmd.c
+++ b/base/shell/cmd/cmd.c
@@ -902,7 +902,11 @@ GetEnvVarOrSpecial(LPCTSTR varName)
     if (var)
         return var;
 
-    /* env var doesn't exist, look for a "special" one */
+    /* The environment variable doesn't exist, look for
+     * a "special" one only if extensions are enabled. */
+    if (!bEnableExtensions)
+        return NULL;
+
     /* %CD% */
     if (_tcsicmp(varName, _T("CD")) == 0)
     {