diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:02:40 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:02:40 +0200 |
commit | 2043a358ea64fe220e0fdee09d1f3aa1fd6aaad7 (patch) | |
tree | a746d635d73facdc9823346c973e50727b91054f | |
parent | f799d19d6df12e20fc133ef8466d310427cc68ca (diff) | |
parent | 11c985829493f3aed8e7894e5f9fdd44891ec249 (diff) | |
download | qtsvg-2043a358ea64fe220e0fdee09d1f3aa1fd6aaad7.tar.gz |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3
Change-Id: I6be198d51f5e4c617724bd9c4098bd2bed45b995
-rw-r--r-- | src/svg/qsvghandler.cpp | 7 |
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)); |