i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when debug information wasn't available.

Browse Source
This commit is contained in:
Rene Gollent
2012-12-04 21:22:11 -05:00
parent 860c710c4b
commit b060c28e65
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/debugger/value/value_nodes/BListValueNode.cpp
+14 -6
View File
@@ -223,11 +223,17 @@ BListValueNode::ResolvedLocationAndValue(ValueLoader* valueLoader,
if (baseType->CountTemplateParameters() != 0) { if (baseType->CountTemplateParameters() != 0) {
// for BObjectList we need to walk up // for BObjectList we need to walk up
// the hierarchy: BObjectList -> _PointerList_ -> BList // the hierarchy: BObjectList -> _PointerList_ -> BList
if (baseType->CountBaseTypes() == 0)
return B_BAD_DATA;
baseType = dynamic_cast<CompoundType*>(baseType->BaseTypeAt(0) baseType = dynamic_cast<CompoundType*>(baseType->BaseTypeAt(0)
->GetType()); ->GetType());
if (baseType == NULL || baseType->Name() != "_PointerList_") if (baseType == NULL || baseType->Name() != "_PointerList_")
return B_BAD_DATA; return B_BAD_DATA;
if (baseType->CountBaseTypes() == 0)
return B_BAD_DATA;
baseType = dynamic_cast<CompoundType*>(baseType->BaseTypeAt(0) baseType = dynamic_cast<CompoundType*>(baseType->BaseTypeAt(0)
->GetType()); ->GetType());
if (baseType == NULL || baseType->Name() != "BList") if (baseType == NULL || baseType->Name() != "BList")
@@ -303,14 +309,16 @@ BListValueNode::CreateChildren()
if (fChildrenCreated) if (fChildrenCreated)
return B_OK; return B_OK;
BListItemCountNodeChild* countChild = new(std::nothrow) if (fItemCountType != NULL) {
BListItemCountNodeChild(fItemCountLocation, this, fItemCountType); BListItemCountNodeChild* countChild = new(std::nothrow)
BListItemCountNodeChild(fItemCountLocation, this, fItemCountType);
if (countChild == NULL) if (countChild == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
countChild->SetContainer(fContainer); countChild->SetContainer(fContainer);
fChildren.AddItem(countChild); fChildren.AddItem(countChild);
}
BReference<Type> addressTypeRef; BReference<Type> addressTypeRef;
Type* type = NULL; Type* type = NULL;