Commit 3b145f00 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Debugger: Small fixes

CDB: expand pointers correctly
Check for watchpoints at pointed to-addresses correctly.
parent aaf95f28
......@@ -230,7 +230,10 @@ bool WatchHandleDumperInserter::expandPointerToDumpable(const WatchData &wd, QSt
const int classPos = wd.value.indexOf(" class ");
if (classPos == -1)
break;
const QString hexAddrS = wd.value.mid(0, classPos);
// Fix CDB word separator '0x00000000`0012fe10'.
QString hexAddrS = wd.value.mid(0, classPos);
if (hexAddrS.size() > 11 && hexAddrS.at(10) == QLatin1Char('`'))
hexAddrS.remove(10, 1);
if (m_hexNullPattern.exactMatch(hexAddrS))
break;
const QByteArray type = stripPointerType(wd.type);
......
......@@ -733,7 +733,7 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
case LocalsIsWatchpointAtPointerValueRole:
if (isPointerType(data.type))
return engine()->breakHandler()
->watchPointAt(pointerValue(data.addr));
->watchPointAt(pointerValue(data.value));
return false;
default:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment