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

Debugger/Dumpers: Perform checks on QList/QVector<RawPointer>.

Browse Source 
Reviewed-by: hjk <qtc-committer@nokia.com>
This commit is contained in:
Friedemann Kleint
2009-10-13 12:35:47 +02:00
parent 5bee5dea13
commit 744febe01a
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
share/qtcreator/gdbmacros/gdbmacros.cpp
View File

@@ -1618,9 +1618,11 @@ static void qDumpQList(QDumper &d)
const QListData &ldata = *reinterpret_cast<const QListData*>(d.data); const QListData &ldata = *reinterpret_cast<const QListData*>(d.data);
const QListData::Data *pdata = const QListData::Data *pdata =
*reinterpret_cast<const QListData::Data* const*>(d.data); *reinterpret_cast<const QListData::Data* const*>(d.data);
int nn = ldata.size(); const int nn = ldata.size();
if (nn < 0) if (nn < 0)
return; return;
const bool innerTypeIsPointer = isPointerType(d.innerType);
const int n = qMin(nn, 1000);
if (nn > 0) { if (nn > 0) {
if (ldata.d->begin < 0) if (ldata.d->begin < 0)
return; return;
@@ -1631,18 +1633,19 @@ static void qDumpQList(QDumper &d)
return; return;
#endif #endif
qCheckAccess(ldata.d->array); qCheckAccess(ldata.d->array);
//qCheckAccess(ldata.d->array[0]); // Additional checks on pointer arrays
//qCheckAccess(ldata.d->array[nn - 1]); if (innerTypeIsPointer)
for (int i = 0; i != n; ++i)
if (const void *p = ldata.d->array + i + pdata->begin)
qCheckAccess(deref(p));
} }
qCheckAccess(pdata); qCheckAccess(pdata);
int n = nn;
d.putItemCount("value", n); d.putItemCount("value", n);
d.putItem("valueeditable", "false"); d.putItem("valueeditable", "false");
d.putItem("numchild", n); d.putItem("numchild", n);
if (d.dumpChildren) { if (d.dumpChildren) {
unsigned innerSize = d.extraInt[0]; const unsigned innerSize = d.extraInt[0];
bool innerTypeIsPointer = isPointerType(d.innerType);
QByteArray strippedInnerType = stripPointerType(d.innerType); QByteArray strippedInnerType = stripPointerType(d.innerType);
// The exact condition here is: // The exact condition here is:
@@ -1653,8 +1656,6 @@ static void qDumpQList(QDumper &d)
bool isInternal = innerSize <= int(sizeof(void*)) bool isInternal = innerSize <= int(sizeof(void*))
&& isMovableType(d.innerType); && isMovableType(d.innerType);
d.putItem("internal", (int)isInternal); d.putItem("internal", (int)isInternal);
if (n > 1000)
n = 1000;
d.beginChildren(n ? d.innerType : 0); d.beginChildren(n ? d.innerType : 0);
for (int i = 0; i != n; ++i) { for (int i = 0; i != n; ++i) {
d.beginHash(); d.beginHash();
@@ -2917,23 +2918,21 @@ static void qDumpQVector(QDumper &d)
int nn = v->size; int nn = v->size;
if (nn < 0) if (nn < 0)
return; return;
if (nn > 0) { const bool innerIsPointerType = isPointerType(d.innerType);
//qCheckAccess(&vec.front());
//qCheckAccess(&vec.back());
}
const unsigned innersize = d.extraInt[0]; const unsigned innersize = d.extraInt[0];
const int n = qMin(nn, 1000);
// Check pointers
if (innerIsPointerType && nn > 0)
for (int i = 0; i != n; ++i)
if (const void *p = addOffset(v, i * innersize + typeddatasize))
qCheckAccess(deref(p));
int n = nn;
d.putItemCount("value", n); d.putItemCount("value", n);
d.putItem("valueeditable", "false"); d.putItem("valueeditable", "false");
d.putItem("numchild", n); d.putItem("numchild", n);
if (d.dumpChildren) { if (d.dumpChildren) {
QByteArray strippedInnerType = stripPointerType(d.innerType); QByteArray strippedInnerType = stripPointerType(d.innerType);
const char *stripped = const char *stripped = innerIsPointerType ? strippedInnerType.data() : 0;
isPointerType(d.innerType) ? strippedInnerType.data() : 0;
if (n > 1000)
n = 1000;
d.beginChildren(d.innerType); d.beginChildren(d.innerType);
for (int i = 0; i != n; ++i) { for (int i = 0; i != n; ++i) {
d.beginHash(); d.beginHash();