From 46d047b76cd9d5edae2b320aa696af63e3ee7cd9 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Mon, 11 Apr 2022 11:09:49 +0200
Subject: 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>
---
 src/corelib/kernel/qmimedata.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/corelib/kernel/qmimedata.cpp')

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) {
-- 
cgit v1.2.3