From ea288992f2d4875b2e858642edfd48b2397264f9 Mon Sep 17 00:00:00 2001
From: Aaron Robinson <arobins@microsoft.com>
Date: Fri, 9 Sep 2022 06:55:13 -0700
Subject: [PATCH] Missed full type initialization

---
 src/coreclr/ilasm/asmman.cpp | 2 +-
 src/coreclr/ilasm/asmman.hpp | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/coreclr/ilasm/asmman.cpp b/src/coreclr/ilasm/asmman.cpp
index 447267d0b4d252..3209abad478e3d 100644
--- a/src/coreclr/ilasm/asmman.cpp
+++ b/src/coreclr/ilasm/asmman.cpp
@@ -782,7 +782,7 @@ BOOL    AsmMan::SetComTypeClassTok(mdToken tkClass)
 
 void    AsmMan::StartManifestRes(_In_ __nullterminated char* szName, _In_ __nullterminated char* szAlias, DWORD dwAttr)
 {
-    if((m_pCurManRes = new AsmManRes))
+    if((m_pCurManRes = new (nothrow) AsmManRes()))
     {
         m_pCurManRes->szName = szName;
         m_pCurManRes->szAlias = szAlias;
diff --git a/src/coreclr/ilasm/asmman.hpp b/src/coreclr/ilasm/asmman.hpp
index 972c8382434f8e..aeec28684fdbe1 100644
--- a/src/coreclr/ilasm/asmman.hpp
+++ b/src/coreclr/ilasm/asmman.hpp
@@ -95,12 +95,7 @@ struct AsmManComType
     mdToken tkClass;
     BOOL    m_fNew;
     CustomDescrList m_CustomDescrList;
-    AsmManComType()
-    {
-        szName = szFileName = szAsmRefName = szComTypeName = NULL;
-        m_fNew = TRUE;
-        tkImpl = 0;
-    };
+    AsmManComType() = default;
     ~AsmManComType()
     {
         if(szName) delete szName;
@@ -123,7 +118,7 @@ struct AsmManRes
     BOOL    m_fNew;
 	CustomDescrList m_CustomDescrList;
 	char*	szAsmRefName;
-	AsmManRes() { szName = szAlias = szAsmRefName = szFileName = NULL; ulOffset = 0; tkTok = 0; dwAttr = 0; m_fNew = TRUE; };
+	AsmManRes() = default;
 	~AsmManRes()
 	{
         if(szAlias && (szAlias != szName)) delete szAlias;