Fix a security hole in shell binaries:

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 4412ac27ed0fbb4e47d5fdf050774ddae7fe0730..33301542785f07a53a536983988802ad4c6f76af 100755 (executable)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -29,8 +29,24 @@
 @REM\r
 pushd .\r
 cd %~dp0\r
+\r
+if not defined WORKSPACE (\r
+  @goto SetWorkSpace\r
+)\r
+\r
+if %WORKSPACE% == %CD% (\r
+  @REM Workspace is not changed.\r
+  @goto ParseArgs\r
+)\r
+\r
+:SetWorkSpace\r
+@REM set new workspace\r
+@REM clear EFI_SOURCE and EDK_SOURCE for the new workspace\r
 set WORKSPACE=%CD%\r
+set EFI_SOURCE=\r
+set EDK_SOURCE=\r
 \r
+:ParseArgs\r
 @if /I "%1"=="-h" goto Usage\r
 @if /I "%1"=="-help" goto Usage\r
 @if /I "%1"=="--help" goto Usage\r
@@ -51,9 +67,13 @@ if not defined VCINSTALLDIR (
     if defined VS80COMNTOOLS (\r
       call "%VS80COMNTOOLS%\vsvars32.bat"\r
     ) else (\r
-      echo.\r
-      echo !!! WARNING !!! Cannot find Visual Studio !!!\r
-      echo.\r
+      if defined VS90COMNTOOLS (\r
+        call "%VS90COMNTOOLS%\vsvars32.bat"\r
+      ) else (\r
+        echo.\r
+        echo !!! WARNING !!! Cannot find Visual Studio !!!\r
+        echo.\r
+      )\r
     )\r
   )\r
 )\r