Check for cloned handles when dumping (bug 5245, r=asherkin).
This commit is contained in:
parent
6d528b5c55
commit
b3e48b0ad7
@ -1095,12 +1095,32 @@ void HandleSystem::Dump(HANDLE_REPORTER rep)
|
|||||||
const char *type = "ANON";
|
const char *type = "ANON";
|
||||||
QHandleType *pType = &m_Types[m_Handles[i].type];
|
QHandleType *pType = &m_Types[m_Handles[i].type];
|
||||||
unsigned int size = 0;
|
unsigned int size = 0;
|
||||||
|
unsigned int parentIdx;
|
||||||
|
bool bresult;
|
||||||
if (pType->nameIdx != -1)
|
if (pType->nameIdx != -1)
|
||||||
{
|
{
|
||||||
type = m_strtab->GetString(pType->nameIdx);
|
type = m_strtab->GetString(pType->nameIdx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((parentIdx = m_Handles[i].clone) != 0)
|
||||||
|
{
|
||||||
|
if (m_Handles[parentIdx].refcount > 0)
|
||||||
|
{
|
||||||
|
size = 0;
|
||||||
|
bresult = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
bresult = pType->dispatch->GetHandleApproxSize(m_Handles[parentIdx].type, m_Handles[parentIdx].object, &size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
bresult = pType->dispatch->GetHandleApproxSize(m_Handles[i].type, m_Handles[i].object, &size);
|
||||||
|
}
|
||||||
|
|
||||||
if (pType->dispatch->GetDispatchVersion() < HANDLESYS_MEMUSAGE_MIN_VERSION
|
if (pType->dispatch->GetDispatchVersion() < HANDLESYS_MEMUSAGE_MIN_VERSION
|
||||||
|| !pType->dispatch->GetHandleApproxSize(m_Handles[i].type, m_Handles[i].object, &size))
|
|| !bresult)
|
||||||
{
|
{
|
||||||
rep("0x%08x\t%-20.20s\t%-20.20s\t%-10.10s", index, owner, type, "-1");
|
rep("0x%08x\t%-20.20s\t%-20.20s\t%-10.10s", index, owner, type, "-1");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user