diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp index d3834d8c940..65f2b64e3f9 100644 --- a/src/corelib/text/qstringconverter.cpp +++ b/src/corelib/text/qstringconverter.cpp @@ -2082,6 +2082,8 @@ const char *QStringConverter::name() const noexcept */ std::optional QStringConverter::encodingForName(const char *name) noexcept { + if (!name) + return std::nullopt; for (qsizetype i = 0; i < LastEncoding + 1; ++i) { if (nameMatch(encodingInterfaces[i].name, name)) return QStringConverter::Encoding(i); diff --git a/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp b/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp index 3202f553e8f..2886d5920f7 100644 --- a/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp +++ b/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp @@ -2220,14 +2220,18 @@ void tst_QStringConverter::encodingForName_data() QTest::newRow("latin1") << QByteArray("latin1") << std::optional(QStringConverter::Latin1); QTest::newRow("latin2") << QByteArray("latin2") << std::optional(); QTest::newRow("latin15") << QByteArray("latin15") << std::optional(); + QTest::newRow("") << QByteArray("") << std::optional(); + QTest::newRow("") << QByteArray(nullptr) << std::optional(); } void tst_QStringConverter::encodingForName() { - QFETCH(QByteArray, name); - QFETCH(std::optional, encoding); + QFETCH(const QByteArray, name); + QFETCH(const std::optional, encoding); - auto e = QStringConverter::encodingForName(name); + const auto *ptr = name.isNull() ? nullptr : name.data(); + + const auto e = QStringConverter::encodingForName(ptr); QCOMPARE(e, encoding); }