Fix crash when format specifiers are passed

microsoft · Jun 28, 2019 · a6d40ba · a6d40ba
1 parent 74d63d7
commit a6d40ba
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/docker/Tests/vswhere.tests.ps1 b/docker/Tests/vswhere.tests.ps1
@@ -200,6 +200,11 @@ Describe 'vswhere' {
             @($instances.instances.instance).Count | Should Be 1
             @($instances.instances.instance)[0].instanceId | Should Be 2
         }
+
+        It 'does not crash when passed %0' {
+            $message = C:\bin\vswhere.exe -version '%0'
+            $message[-1] | Should Be 'Error 0x57: The version "%0" is not a valid version range'
+        }
     }
 
     Context '-latest' {

diff --git a/inc/Common.Debug.props b/inc/Common.Debug.props
@@ -7,6 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
+      <LanguageStandard>stdcpp14</LanguageStandard>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Lib>

diff --git a/inc/Common.props b/inc/Common.props
@@ -7,6 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
+      <LanguageStandard>stdcpp14</LanguageStandard>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Lib>

diff --git a/src/vswhere/Program.cpp b/src/vswhere/Program.cpp
@@ -92,7 +92,7 @@ int wmain(_In_ int argc, _In_ LPCWSTR argv[])
         const auto* err = dynamic_cast<const win32_error*>(&ex);
         if (err)
         {
-            console.WriteLine(err->wwhat());
+            console.WriteLine(L"%ls", err->wwhat());
         }
         else
         {