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

Debugger: Do not crash when displaying uninitialized QImages

Browse Source 
Fixes: QTCREATORBUG-23031
Change-Id: I074cdaf509edac6e5659d2e976ed7188e8944d81
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-10-01 16:36:42 +02:00
parent 0907bc8658
commit 312ff692b0
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2296,6 +2296,10 @@ void WatchModel::showEditValue(const WatchItem *item)
QTC_ASSERT(0 < nbytes && nbytes < 10000 * 10000, return);
QTC_ASSERT(0 < imformat && imformat < 32, return);
QImage im(width, height, QImage::Format(imformat));
const qsizetype size = im.sizeInBytes();
// If our computation of image size doesn't fit the client's
// chances are that we can't properly display it either.
if (size == nbytes) {
std::memcpy(im.bits(), bits, nbytes);
auto v = m_separatedView->prepareObject<ImageViewer>(item);
v->setInfo(item->address ?
@@ -2305,6 +2309,7 @@ void WatchModel::showEditValue(const WatchItem *item)
.arg(width).arg(height).arg(nbytes).arg(im.format()).arg(im.depth())
);
v->setImage(im);
}
} else if (format == DisplayLatin1String
|| format == DisplayUtf8String
|| format == DisplayUtf16String