Merge branch 'perftest-results-msvc' of github.com:jkoritzinsky/DNMD …

…into perftest-results-msvc
AaronRobinsonMSFT · Oct 17, 2024 · 76778fc · 76778fc
2 parents e729679 + 5d02f93
commit 76778fc
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/interfaces/importhelpers.cpp b/src/interfaces/importhelpers.cpp
@@ -603,12 +603,14 @@ namespace
         if (!md_get_column_value_as_blob(sourceAssembly, mdtAssembly_PublicKey, &publicKey, &publicKeyLength))
             return E_FAIL;
 
+        span<const uint8_t> publicKeyTokenSpan;
         StrongNameToken publicKeyToken;
         if (publicKey != nullptr)
         {
             assert(IsAfPublicKey(flags));
             flags &= ~afPublicKey;
             RETURN_IF_FAILED(StrongNameTokenFromPublicKey({ publicKey, publicKeyLength }, publicKeyToken));
+            publicKeyTokenSpan = { publicKeyToken.data(), publicKeyToken.size() };
         }
         else
         {
@@ -648,7 +650,7 @@ namespace
             flags,
             assemblyName,
             assemblyCulture,
-            { publicKeyToken.data(), publicKeyToken.size() },
+            publicKeyTokenSpan,
             targetAssembly));
 
         if (hr == S_OK)