1 files changed, 14 insertions, 47 deletions

diff --git a/src/testlib/qtestjunitstreamer.cpp b/src/testlib/qtestjunitstreamer.cpp
index 72ab7d1534..ee6fee2f2b 100644
--- a/src/testlib/qtestjunitstreamer.cpp
+++ b/src/testlib/qtestjunitstreamer.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtTest module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include <QtTest/private/qtestjunitstreamer_p.h>
 #include <QtTest/private/qjunittestlogger_p.h>
@@ -106,23 +70,26 @@ void QTestJUnitStreamer::formatEnd(const QTestElement *element, QTestCharBuffer
     QTest::qt_asprintf(formatted, "%s</%s>\n", indent, element->elementName());
 }
 
-void QTestJUnitStreamer::formatAttributes(const QTestElement* element, const QTestElementAttribute *attribute, QTestCharBuffer *formatted) const
+bool QTestJUnitStreamer::formatAttributes(const QTestElement* element,
+                                          const QTestElementAttribute *attribute,
+                                          QTestCharBuffer *formatted) const
 {
     if (!attribute || !formatted )
-        return;
+        return false;
 
     QTest::AttributeIndex attrindex = attribute->index();
 
     if (element && element->elementType() == QTest::LET_Text) {
         QTEST_ASSERT(attrindex == QTest::AI_Value);
-        QXmlTestLogger::xmlCdata(formatted, attribute->value());
-        return;
+        return QXmlTestLogger::xmlCdata(formatted, attribute->value());
     }
 
     QTestCharBuffer quotedValue;
-    QXmlTestLogger::xmlQuote(&quotedValue, attribute->value());
-    QTest::qt_asprintf(formatted, " %s=\"%s\"",
-        attribute->name(), quotedValue.constData());
+    if (QXmlTestLogger::xmlQuote(&quotedValue, attribute->value())) {
+        return QTest::qt_asprintf(formatted, " %s=\"%s\"",
+                                  attribute->name(), quotedValue.constData()) != 0;
+    }
+    return false;
 }
 
 void QTestJUnitStreamer::formatAfterAttributes(const QTestElement *element, QTestCharBuffer *formatted) const
@@ -176,8 +143,8 @@ void QTestJUnitStreamer::outputElementAttributes(const QTestElement* element, co
     QTestCharBuffer buf;
 
     for (auto *attribute : attributes) {
-        formatAttributes(element, attribute, &buf);
-        outputString(buf.data());
+        if (formatAttributes(element, attribute, &buf))
+            outputString(buf.data());
     }
 }