From 507b9963b8665753a1ea4ab1438938db0b8a5cf8 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 6 May 2022 01:21:20 +0200 Subject: [PATCH] QXmlStreamWriter: port Private::write(p, n) from int to qsizetype We have at least one caller which passes QtContainer::size() as the length, so don't truncate. Pick-to: 6.3 6.2 Task-number: QTBUG-102465 Change-Id: I8a692bd6a7b75e745c08b072f53b6efe901d5436 Reviewed-by: Thiago Macieira Reviewed-by: Edward Welbourne --- src/corelib/serialization/qxmlstream.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index 7e2d851c6d..17f75bb142 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -2850,7 +2850,7 @@ public: void write(const XmlStringRef &); void write(const QString &); void writeEscaped(const QString &, bool escapeWhitespace = false); - void write(const char *s, int len); + void write(const char *s, qsizetype len); template void write(const char (&s)[N]) { write(s, N - 1); } bool finishStartElement(bool contents = true); void writeStartElement(const QString &namespaceUri, const QString &name); @@ -2986,7 +2986,7 @@ void QXmlStreamWriterPrivate::writeEscaped(const QString &s, bool escapeWhitespa } // Writes utf8 -void QXmlStreamWriterPrivate::write(const char *s, int len) +void QXmlStreamWriterPrivate::write(const char *s, qsizetype len) { if (device) { if (hasIoError)