From 7f5dbc8d7c6a12571a049a769446beb4788ae54b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 4 May 2009 12:12:45 +0200
Subject: [PATCH] Fixed crash when evaluating dumpers.
---
src/plugins/debugger/watchutils.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 5be973677e1..3a5b891533b 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -342,23 +342,23 @@ QString decodeData(const QByteArray &ba, int encoding)
}
case 2: { // base64 encoded 16 bit data, used for QString
const QChar doubleQuote(QLatin1Char('"'));
- const QByteArray ba = QByteArray::fromBase64(ba);
+ const QByteArray decodedBa = QByteArray::fromBase64(ba);
QString rc = doubleQuote;
- rc += QString::fromUtf16(reinterpret_cast<const ushort *>(ba.data()), ba.size() / 2);
+ rc += QString::fromUtf16(reinterpret_cast<const ushort *>(decodedBa.data()), decodedBa.size() / 2);
rc += doubleQuote;
return rc;
}
case 3: { // base64 encoded 32 bit data
- const QByteArray ba = QByteArray::fromBase64(ba);
+ const QByteArray decodedBa = QByteArray::fromBase64(ba);
const QChar doubleQuote(QLatin1Char('"'));
QString rc = doubleQuote;
- rc += QString::fromUcs4(reinterpret_cast<const uint *>(ba.data()), ba.size() / 4);
+ rc += QString::fromUcs4(reinterpret_cast<const uint *>(decodedBa.data()), decodedBa.size() / 4);
rc += doubleQuote;
return rc;
}
case 4: { // base64 encoded 16 bit data, without quotes (see 2)
- const QByteArray ba = QByteArray::fromBase64(ba);
- return QString::fromUtf16(reinterpret_cast<const ushort *>(ba.data()), ba.size() / 2);
+ const QByteArray decodedBa = QByteArray::fromBase64(ba);
+ return QString::fromUtf16(reinterpret_cast<const ushort *>(decodedBa.data()), decodedBa.size() / 2);
}
}
return QCoreApplication::translate("Debugger", "<Encoding error>");
--
GitLab