From 11c985829493f3aed8e7894e5f9fdd44891ec249 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 1 Mar 2019 11:02:05 +0100
Subject: Fix assert on misplaced tspan element

Change-Id: I75b3a88aae3cbd7838474d7a78f29fcd58172fc2
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 src/svg/qsvghandler.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 599ed56..d30cf9f 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -3744,6 +3744,13 @@ bool QSvgHandler::startElement(const QString &localName,
             case QSvgNode::DEFS:
             case QSvgNode::SWITCH:
             {
+                if (node->type() == QSvgNode::TSPAN) {
+                    const QByteArray msg = QByteArrayLiteral("\'tspan\' element in wrong context.");
+                    qCWarning(lcSvgHandler, "%s", prefixMessage(msg, xml).constData());
+                    delete node;
+                    node = 0;
+                    break;
+                }
                 QSvgStructureNode *group =
                     static_cast<QSvgStructureNode*>(m_nodes.top());
                 group->addChild(node, someId(attributes));
-- 
cgit v1.2.1