Skip to content

[lldb][NativePDB] Fix crash in debugger when PDB has bad type index value #166455

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −11
Open

[lldb][NativePDB] Fix crash in debugger when PDB has bad type index value #166455

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
14 changes: 9 additions & 5 deletions lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1719,19 +1719,23 @@ void SymbolFileNativePDB::ParseInlineSite(PdbCompilandSymId id,
}

// Get the inlined function name.
CVType inlinee_cvt = m_index->ipi().getType(inline_site.Inlinee);
std::string inlinee_name;
if (inlinee_cvt.kind() == LF_MFUNC_ID) {
llvm::Expected<CVType> inlinee_cvt =
m_index->ipi().typeCollection().getTypeOrError(inline_site.Inlinee);
if (!inlinee_cvt) {
inlinee_name = "[error reading function name: " +
llvm::toString(inlinee_cvt.takeError()) + "]";
} else if (inlinee_cvt->kind() == LF_MFUNC_ID) {
MemberFuncIdRecord mfr;
cantFail(
TypeDeserializer::deserializeAs<MemberFuncIdRecord>(inlinee_cvt, mfr));
TypeDeserializer::deserializeAs<MemberFuncIdRecord>(*inlinee_cvt, mfr));
LazyRandomTypeCollection &types = m_index->tpi().typeCollection();
inlinee_name.append(std::string(types.getTypeName(mfr.ClassType)));
inlinee_name.append("::");
inlinee_name.append(mfr.getName().str());
} else if (inlinee_cvt.kind() == LF_FUNC_ID) {
} else if (inlinee_cvt->kind() == LF_FUNC_ID) {
FuncIdRecord fir;
cantFail(TypeDeserializer::deserializeAs<FuncIdRecord>(inlinee_cvt, fir));
cantFail(TypeDeserializer::deserializeAs<FuncIdRecord>(*inlinee_cvt, fir));
TypeIndex parent_idx = fir.getParentScope();
if (!parent_idx.isNoneType()) {
LazyRandomTypeCollection &ids = m_index->ipi().typeCollection();
Expand Down
2 changes: 1 addition & 1 deletion llvm/include/llvm/DebugInfo/CodeView/LazyRandomTypeCollection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class LLVM_ABI LazyRandomTypeCollection : public TypeCollection {
uint32_t getOffsetOfType(TypeIndex Index);

std::optional<CVType> tryGetType(TypeIndex Index);

llvm::Expected<CVType> getTypeOrError(TypeIndex Index);
CVType getType(TypeIndex Index) override;
StringRef getTypeName(TypeIndex Index) override;
bool contains(TypeIndex Index) override;
Expand Down
15 changes: 10 additions & 5 deletions llvm/lib/DebugInfo/CodeView/LazyRandomTypeCollection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,20 +93,25 @@ CVType LazyRandomTypeCollection::getType(TypeIndex Index) {
return Records[Index.toArrayIndex()].Type;
}

std::optional<CVType> LazyRandomTypeCollection::tryGetType(TypeIndex Index) {
llvm::Expected<CVType>
LazyRandomTypeCollection::getTypeOrError(TypeIndex Index) {
if (Index.isSimple())
return std::nullopt;
return llvm::createStringError("Type index too low (%d)", Index.getIndex());

if (auto EC = ensureTypeExists(Index)) {
consumeError(std::move(EC));
return std::nullopt;
return EC;
}

if (!contains(Index))
return std::nullopt;
return llvm::createStringError("Type index too high (%d)",
Index.getIndex());
return Records[Index.toArrayIndex()].Type;
}

std::optional<CVType> LazyRandomTypeCollection::tryGetType(TypeIndex Index) {
return llvm::expectedToOptional(getTypeOrError(Index));
}

StringRef LazyRandomTypeCollection::getTypeName(TypeIndex Index) {
if (Index.isNoneType() || Index.isSimple())
return TypeIndex::simpleTypeName(Index);
Expand Down