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

Debugger/CDB: Increase limits on string size in watch data.

Browse Source 
Introduce truncation in item view instead (full value visible in
ToolTip).

Reviewed-by: hjk
Task-number: QTCREATORBUG-305
(cherry picked from commit 55b4e6d383)
This commit is contained in:
Friedemann Kleint
2010-01-13 10:36:37 +01:00
committed by con
parent 5813394b17
commit 4be033ae40
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
View File

@@ -750,9 +750,10 @@ static inline bool getUnsignedHexValue(CIDebugSymbolGroup *sg, int index, quint6
return getUnsignedHexValue(stringValue, value); return getUnsignedHexValue(stringValue, value);
} }
enum { maxStringLength = 4096 };
int CdbSymbolGroupContext::dumpQString(CIDebugDataSpaces *ds, WatchData *wd) int CdbSymbolGroupContext::dumpQString(CIDebugDataSpaces *ds, WatchData *wd)
{ {
const int maxLength = 40;
QString errorMessage; QString errorMessage;
unsigned long stringIndex; unsigned long stringIndex;
if (!lookupPrefix(wd->iname, &stringIndex)) if (!lookupPrefix(wd->iname, &stringIndex))
@@ -774,9 +775,9 @@ int CdbSymbolGroupContext::dumpQString(CIDebugDataSpaces *ds, WatchData *wd)
if (!getUnsignedHexValue(m_symbolGroup, arrayIndex, &array)) if (!getUnsignedHexValue(m_symbolGroup, arrayIndex, &array))
return 5; return 5;
// Fetch // Fetch
const bool truncated = size > maxLength; const bool truncated = size > maxStringLength;
if (truncated) if (truncated)
size = maxLength; size = maxStringLength;
const QChar doubleQuote = QLatin1Char('"'); const QChar doubleQuote = QLatin1Char('"');
QString value; QString value;
if (size > 0) { if (size > 0) {
@@ -808,7 +809,6 @@ int CdbSymbolGroupContext::dumpQString(CIDebugDataSpaces *ds, WatchData *wd)
int CdbSymbolGroupContext::dumpStdString(WatchData *wd) int CdbSymbolGroupContext::dumpStdString(WatchData *wd)
{ {
const int maxLength = 40;
QString errorMessage; QString errorMessage;
unsigned long stringIndex; unsigned long stringIndex;
if (!lookupPrefix(wd->iname, &stringIndex)) if (!lookupPrefix(wd->iname, &stringIndex))
@@ -835,8 +835,8 @@ int CdbSymbolGroupContext::dumpStdString(WatchData *wd)
if (quotePos == -1) if (quotePos == -1)
return 1; return 1;
bufValue.remove(0, quotePos); bufValue.remove(0, quotePos);
if (bufValue.size() > maxLength) { if (bufValue.size() > maxStringLength) {
bufValue.truncate(maxLength); bufValue.truncate(maxStringLength);
bufValue += QLatin1String("...\""); bufValue += QLatin1String("...\"");
} }
wd->setValue(bufValue); wd->setValue(bufValue);

16
src/plugins/debugger/watchhandler.cpp
View File

@@ -727,6 +727,18 @@ void WatchModel::emitDataChanged(int column, const QModelIndex &parentIndex)
emitDataChanged(column, index(i, 0, parentIndex)); emitDataChanged(column, index(i, 0, parentIndex));
} }
// Truncate value for item view, maintaining quotes
static inline QString truncateValue(QString v)
{
enum { maxLength = 512 };
if (v.size() < maxLength)
return v;
const bool isQuoted = v.endsWith(QLatin1Char('"')); // check for 'char* "Hallo"'
v.truncate(maxLength);
v += isQuoted ? QLatin1String("...\"") : QLatin1String("...");
return v;
}
QVariant WatchModel::data(const QModelIndex &idx, int role) const QVariant WatchModel::data(const QModelIndex &idx, int role) const
{ {
const WatchItem &data = *watchItem(idx); const WatchItem &data = *watchItem(idx);
@@ -735,9 +747,9 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
case Qt::DisplayRole: { case Qt::DisplayRole: {
switch (idx.column()) { switch (idx.column()) {
case 0: return data.name; case 0: return data.name;
case 1: return formattedValue(data, case 1: return truncateValue(formattedValue(data,
m_handler->m_individualFormats.value(data.iname, -1), m_handler->m_individualFormats.value(data.iname, -1),
m_handler->m_typeFormats.value(data.type, -1)); m_handler->m_typeFormats.value(data.type, -1)));
case 2: case 2:
if (!data.displayedType.isEmpty()) if (!data.displayedType.isEmpty())
return data.displayedType; return data.displayedType;