diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-16 03:04:04 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-16 03:04:04 +0200 |
| commit | ad4dae27a8cc86d81875fec14d8a38af6f3d5ff0 (patch) | |
| tree | 6e26b56d0314294551ad5fda1f2619d73e0b31fe | |
| parent | 798f3010b1b6fe14b3bb56f136b7f126b8144398 (diff) | |
| parent | 2043a358ea64fe220e0fdee09d1f3aa1fd6aaad7 (diff) | |
| download | qtsvg-ad4dae27a8cc86d81875fec14d8a38af6f3d5ff0.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ieca44d9fb4cdf507dfd35536baa35c8d7c70a4fc
| -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)); |