feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Fix dereference function of the cdb value

Browse Source 
Change-Id: I6815679900cde6365f2ed7ca874a081babd366c1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2016-11-17 15:53:58 +01:00
parent 1df8f19257
commit 432fcb65d4
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/libs/qtcreatorcdbext/pyvalue.cpp
View File

@@ -168,24 +168,26 @@ PyObject *value_Dereference(Value *self)
{ {
if (!self->m_symbolGroup) if (!self->m_symbolGroup)
Py_RETURN_NONE; Py_RETURN_NONE;
DEBUG_SYMBOL_PARAMETERS params;
const HRESULT hr = self->m_symbolGroup->GetSymbolParameters(self->m_index, 1, &params);
if (FAILED(hr))
Py_RETURN_NONE;
char *name = getTypeName(params.Module, params.TypeId); char *typeName = getTypeName(self);
std::string typeNameStr(typeName);
const bool isPointer = isPointerType(typeNameStr);
const bool isArray = !isPointer && endsWith(typeNameStr, "]");
delete[] typeName;
PyObject *ret = reinterpret_cast<PyObject*>(self); if (isPointer || isArray) {
if (endsWith(std::string(name), "*")) { std::string valueName = getSymbolName(self);
if (numberOfChildren(self) > 0 && expandValue(self)) { if (isPointer)
ULONG symbolCount = 0; valueName.insert(0, 1, '*');
self->m_symbolGroup->GetNumberSymbols(&symbolCount); else
if (symbolCount > self->m_index + 1) valueName.append("[0]");
ret = createValue(self->m_index + 1, self->m_symbolGroup); ULONG index = DEBUG_ANY_ID;
} if (SUCCEEDED(self->m_symbolGroup->AddSymbol(valueName.c_str(), &index)))
return createValue(index, self->m_symbolGroup);
} }
delete[] name; PyObject *ret = reinterpret_cast<PyObject*>(self);
Py_XINCREF(ret);
return ret; return ret;
} }