Implement fix in DNMD for dotnet/runtime#108907

AaronRobinsonMSFT · Oct 15, 2024 · 1b96e8b · 1b96e8b
1 parent 9e7cd7e
commit 1b96e8b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/interfaces/importhelpers.cpp b/src/interfaces/importhelpers.cpp
@@ -602,17 +602,20 @@ namespace
         uint32_t publicKeyLength;
         if (1 != md_get_column_value_as_blob(sourceAssembly, mdtAssembly_PublicKey, 1, &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
         {
             assert(!IsAfPublicKey(flags));
+            publicKeyTokenSpan = { nullptr, 0 };
         }
 
         uint32_t majorVersion;
@@ -648,7 +651,7 @@ namespace
             flags,
             assemblyName,
             assemblyCulture,
-            { publicKeyToken.data(), publicKeyToken.size() },
+            publicKeyTokenSpan,
             targetAssembly));
 
         if (hr == S_OK)