From cac23820c5e5bdf245f698a16f7099315c40d201 Mon Sep 17 00:00:00 2001 From: Simon Wanner Date: Wed, 14 Feb 2024 12:10:58 +0100 Subject: [PATCH] Ladybird/QT: Avoid constructing AK String types from char* without size While QByteArray::data does return a null-terminated char* it's nicer to avoid strlen() when we already know the size --- Ladybird/Qt/StringUtils.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Ladybird/Qt/StringUtils.cpp b/Ladybird/Qt/StringUtils.cpp index a34ad01aae..e5a63f495f 100644 --- a/Ladybird/Qt/StringUtils.cpp +++ b/Ladybird/Qt/StringUtils.cpp @@ -8,7 +8,8 @@ AK::ByteString ak_byte_string_from_qstring(QString const& qstring) { - return AK::ByteString(qstring.toUtf8().data()); + auto utf8_data = qstring.toUtf8(); + return AK::ByteString(utf8_data.data(), utf8_data.size()); } String ak_string_from_qstring(QString const& qstring) @@ -24,10 +25,11 @@ QString qstring_from_ak_string(StringView ak_string) AK::URL ak_url_from_qstring(QString const& qstring) { - return AK::URL(qstring.toUtf8().data()); + auto utf8_data = qstring.toUtf8(); + return AK::URL(StringView(utf8_data.data(), utf8_data.size())); } AK::URL ak_url_from_qurl(QUrl const& qurl) { - return AK::URL(qurl.toString().toUtf8().data()); + return ak_url_from_qstring(qurl.toString()); }