diff options
| -rw-r--r-- | src/svg/qsvghandler.cpp | 10 | ||||
| -rw-r--r-- | src/svg/qsvghandler_p.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index ccf0ae6..472b65a 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -3861,16 +3861,17 @@ bool QSvgHandler::endElement(const QStringRef &localName) return true; } -void QSvgHandler::resolveGradients(QSvgNode *node) +void QSvgHandler::resolveGradients(QSvgNode *node, int nestedDepth) { if (!node || (node->type() != QSvgNode::DOC && node->type() != QSvgNode::G && node->type() != QSvgNode::DEFS && node->type() != QSvgNode::SWITCH)) { return; } + QSvgStructureNode *structureNode = static_cast<QSvgStructureNode *>(node); - QList<QSvgNode *> ren = structureNode->renderers(); - for (QList<QSvgNode *>::iterator it = ren.begin(); it != ren.end(); ++it) { + const QList<QSvgNode *> ren = structureNode->renderers(); + for (auto it = ren.begin(); it != ren.end(); ++it) { QSvgFillStyle *fill = static_cast<QSvgFillStyle *>((*it)->styleProperty(QSvgStyleProperty::FILL)); if (fill && !fill->isGradientResolved()) { QString id = fill->gradientId(); @@ -3895,7 +3896,8 @@ void QSvgHandler::resolveGradients(QSvgNode *node) } } - resolveGradients(*it); + if (nestedDepth < 2048) + resolveGradients(*it, nestedDepth + 1); } } diff --git a/src/svg/qsvghandler_p.h b/src/svg/qsvghandler_p.h index 461e48f..da746d2 100644 --- a/src/svg/qsvghandler_p.h +++ b/src/svg/qsvghandler_p.h @@ -178,7 +178,7 @@ private: QCss::Parser m_cssParser; #endif void parse(); - void resolveGradients(QSvgNode *node); + void resolveGradients(QSvgNode *node, int nestedDepth = 0); void resolveNodes(); QPen m_defaultPen; |