diff --git a/src/coreclr/ilasm/asmman.cpp b/src/coreclr/ilasm/asmman.cpp index 18d78a2a3ae04d..1a7118ee2cee5a 100644 --- a/src/coreclr/ilasm/asmman.cpp +++ b/src/coreclr/ilasm/asmman.cpp @@ -779,7 +779,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 99cfc572a8a85e..1a7883df7435bf 100644 --- a/src/coreclr/ilasm/asmman.hpp +++ b/src/coreclr/ilasm/asmman.hpp @@ -78,12 +78,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; @@ -106,7 +101,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;