diff options
| author | Liang Qi <liang.qi@qt.io> | 2022-04-11 11:09:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2022-04-19 09:57:12 +0200 |
| commit | 46d047b76cd9d5edae2b320aa696af63e3ee7cd9 (patch) | |
| tree | 532445d925e2c30bf8176ba93055e48b694f3c80 /src/corelib/kernel/qmimedata.cpp | |
| parent | 4088b27b9397fa9877bf60b8e707bba5dc51e9cb (diff) | |
QMimeData: return null string for null byte array
This is a cherry modification of 5826a7ad921930393c84b790123f493e26d0685c
in 5.15 branch.
Fixes: QTBUG-102438
Pick-to: 6.3 6.2
Change-Id: I8bdb7cb2537c6df7bb1381871b3cc2446ff1d270
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel/qmimedata.cpp')
| -rw-r--r-- | src/corelib/kernel/qmimedata.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp index 7d00ea1061..a3cfc953b7 100644 --- a/src/corelib/kernel/qmimedata.cpp +++ b/src/corelib/kernel/qmimedata.cpp @@ -160,6 +160,8 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QMetaType ty switch (typeId) { case QMetaType::QString: { const QByteArray ba = data.toByteArray(); + if (ba.isNull()) + return QVariant(); if (format == "text/html"_L1) { auto encoding = QStringConverter::encodingForHtml(ba); if (encoding) { |