Skip to content

Missed full type initialization #75340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 1 commit into from
Sep 10, 2022
Merged

Missed full type initialization #75340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/ilasm/asmman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 2 additions & 7 deletions src/coreclr/ilasm/asmman.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down