Skip to content

[release/10.0] Properly enumerate uninstrumented bounds when stackwalking in minidump w/o heap #120073

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
merged 4 commits into from
Sep 30, 2025
Merged

[release/10.0] Properly enumerate uninstrumented bounds when stackwalking in minidump w/o heap #120073

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd1bfa1
properly enumerate uninstrumented bounds
max-charlamb Sep 22, 2025
18978ce
spacing
max-charlamb Sep 22, 2025
9480006
add padding for multi-byte reads
max-charlamb Sep 23, 2025
0cf85c0
use alignup
max-charlamb Sep 23, 2025
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
15 changes: 13 additions & 2 deletions src/coreclr/vm/debuginfostore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,12 +1406,23 @@ void CompressDebugInfo::EnumMemoryRegions(CLRDataEnumMemoryFlags flags, PTR_BYTE
_ASSERTE(flagByte == 0);
}

NibbleReader r(pDebugInfo, 12 /* maximum size of compressed 2 UINT32s */);
NibbleReader r(pDebugInfo, 24 /* maximum size of compressed 4 UINT32s */);

ULONG cbBounds = r.ReadEncodedU32();
ULONG cbUninstrumentedBounds = 0;
if (cbBounds == DebugInfoBoundsHasInstrumentedBounds)
{
// This means we have instrumented bounds.
cbBounds = r.ReadEncodedU32();
cbUninstrumentedBounds = r.ReadEncodedU32();
}
ULONG cbVars = r.ReadEncodedU32();

pDebugInfo += r.GetNextByteIndex() + cbBounds + cbVars;
pDebugInfo += r.GetNextByteIndex() + cbBounds + cbUninstrumentedBounds + cbVars;

// NibbleReader reads in units of sizeof(NibbleChunkType)
// So we need to account for any partial chunk at the end.
pDebugInfo = AlignUp(dac_cast<TADDR>(pDebugInfo), sizeof(NibbleReader::NibbleChunkType));

DacEnumMemoryRegion(dac_cast<TADDR>(pStart), pDebugInfo - pStart);
}
Expand Down
Loading