DynamicDependencies: fix PCWSTR[] access (#872)

* Fixed cert enumeration (incorrect probing caused failures) * Fixed incorrect PCWSTR[] access
microsoft · May 27, 2021 · 5f7911e · 5f7911e
1 parent 51d5fe2
commit 5f7911e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/dev/DynamicDependency/PackageDependency.cpp b/dev/DynamicDependency/PackageDependency.cpp
@@ -42,9 +42,9 @@ std::vector<std::wstring> MddCore::PackageDependency::FindPackagesByFamily() con
     THROW_IF_WIN32_ERROR(FindPackagesByPackageFamily(m_packageFamilyName.c_str(), PACKAGE_FILTER_HEAD | PACKAGE_FILTER_DIRECT, &count, packageFullNames.get(), &bufferLength, buffer.get(), nullptr));
 
     std::vector<std::wstring> packageFullNamesList;
-    auto packageFullName{ *packageFullNames.get() };
-    for (UINT32 index=0; index < count; ++index, ++packageFullName)
+    for (UINT32 index=0; index < count; ++index)
     {
+        const auto packageFullName{ packageFullNames[index] };
         packageFullNamesList.push_back(std::wstring(packageFullName));
     }
     return packageFullNamesList;

diff --git a/tools/DevCheck.ps1 b/tools/DevCheck.ps1
@@ -255,14 +255,15 @@ function Test-DevTestCert
     $pfx = Get-PfxCertificate -FilePath $path
     $thumbprint = $pfx.Thumbprint
 
-    $cert = Get-ChildItem -Path "cert:\LocalMachine\TrustedPeople\$thumbprint"
-    if ([string]::IsNullOrEmpty($cert))
+    $cert_path = "cert:\LocalMachine\TrustedPeople\$thumbprint"
+    if (-not(Test-Path -Path $cert_path))
     {
         Write-Host 'Test certificate...Not Found'
         $global:issues += 1
     }
     else
     {
+        $cert = Get-ChildItem -Path $cert_path
         $expiration = $cert.NotAfter
         $now = Get-Date
         if ($expiration -lt $now)