Skip to content
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

Jump to bottom

Add guard word before local var CMiniColDef[9] #73736

Closed
wants to merge 2 commits into from
Closed

Add guard word before local var CMiniColDef[9] #73736

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
060afd3
Add guard word before local var CMiniColDef[9]
RobertHenry6bev Aug 11, 2022
cccde5b
Simpolify asan-safe implementation of CMiniMdBasse:;InitColsForTable
RobertHenry6bev Aug 12, 2022
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
27 changes: 16 additions & 11 deletions src/coreclr/md/runtime/metamodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,11 +717,16 @@ CMiniMdBase::InitColsForTable(
// should we write the data into the structure
{
const CMiniTableDef *pTemplate; // Template table definition.
CMiniColDef pCols[9]; // The col defs to init.
struct {
uint32_t holds_memory_marker; // a marker so UsesAllocateMemory knows it is not allocated
CMiniColDef pCols[9]; // The col defs to init.
} p;
BYTE iOffset; // Running size of a record.
BYTE iSize; // Size of a field.
HRESULT hr = S_OK;

p.holds_memory_marker = ~((ALLOCATED_MEMORY_MARKER&0xff) * 0x01010101U);

_ASSERTE((bExtra == 0) || (bExtra == 1));
_ASSERTE(ARRAY_SIZE(pCols) >= pTable->m_cCols);

Expand All @@ -737,18 +742,18 @@ CMiniMdBase::InitColsForTable(
for (ULONG ixCol = 0; ixCol < pTable->m_cCols; ++ixCol)
{
// Initialize from the template values (type, maybe offset, size).
pCols[ixCol] = pTemplate->m_pColDefs[ixCol];
p.pCols[ixCol] = pTemplate->m_pColDefs[ixCol];

// Is the field a RID into a table?
if (pCols[ixCol].m_Type <= iRidMax)
if (p.pCols[ixCol].m_Type <= iRidMax)
{
iSize = cbRID(Schema.m_cRecs[pCols[ixCol].m_Type] << bExtra);
iSize = cbRID(Schema.m_cRecs[p.pCols[ixCol].m_Type] << bExtra);
}
else
// Is the field a coded token?
if (pCols[ixCol].m_Type <= iCodedTokenMax)
if (p.pCols[ixCol].m_Type <= iCodedTokenMax)
{
ULONG iCdTkn = pCols[ixCol].m_Type - iCodedToken;
ULONG iCdTkn = p.pCols[ixCol].m_Type - iCodedToken;
ULONG cRecs = 0;

_ASSERTE(iCdTkn < ARRAY_SIZE(g_CodedTokens));
Expand All @@ -773,7 +778,7 @@ CMiniMdBase::InitColsForTable(
}
else
{ // Fixed type.
switch (pCols[ixCol].m_Type)
switch (p.pCols[ixCol].m_Type)
{
#ifdef FEATURE_METADATA_EMIT_PORTABLE_PDB
/* Portable PDB tables */
Expand Down Expand Up @@ -826,8 +831,8 @@ CMiniMdBase::InitColsForTable(
}

// Now save the size and offset.
pCols[ixCol].m_oColumn = iOffset;
pCols[ixCol].m_cbColumn = iSize;
p.pCols[ixCol].m_oColumn = iOffset;
p.pCols[ixCol].m_cbColumn = iSize;

// Align to 2 bytes.
iSize += iSize & 1;
Expand All @@ -842,12 +847,12 @@ CMiniMdBase::InitColsForTable(
// Can we write to the memory
if (!fUsePointers)
{
memcpy(pTable->m_pColDefs, pCols, sizeof(CMiniColDef)*pTable->m_cCols);
memcpy(pTable->m_pColDefs, p.pCols, sizeof(CMiniColDef)*pTable->m_cCols);
}
else
{
// We'll need to have pTable->m_pColDefs point to some data instead
hr = SetNewColumnDefinition(pTable, pCols, ixTbl);
hr = SetNewColumnDefinition(pTable, p.pCols, ixTbl);
}
// If no key, set to a distinct value.
if (pTable->m_iKey >= pTable->m_cCols)
Expand Down