summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-03-01 11:02:05 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-04-12 11:49:16 +0000
commit11c985829493f3aed8e7894e5f9fdd44891ec249 (patch)
treec40124ef6ce5278ed159e57edded0c25c15bc5e9
parentd477ec8f40b28caf3a216d9e8550d8871d5131fb (diff)
Fix assert on misplaced tspan element
Change-Id: I75b3a88aae3cbd7838474d7a78f29fcd58172fc2 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-rw-r--r--src/svg/qsvghandler.cpp7
1 files changed, 7 insertions, 0 deletions
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));