From 3167c1374bb918033b5b4a5b54e0d0608698eeb0 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 1 Oct 2014 18:55:15 +0200 Subject: fix crash on malformed SVG In a gradient that references itself via xlink:href we encountered an infinite recursion, and eventually a stack overflow. Now we print a warning and ignore the invalid link. Task-number: QTBUG-35387 Change-Id: Id72800eaa267d015a471df284245861ed8bc94cd Reviewed-by: Friedemann Kleint --- src/svg/qsvgstyle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index 4385291..662692b 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -937,7 +937,7 @@ void QSvgGradientStyle::resolveStops() { if (!m_link.isEmpty() && m_doc) { QSvgStyleProperty *prop = m_doc->styleProperty(m_link); - if (prop) { + if (prop && prop != this) { if (prop->type() == QSvgStyleProperty::GRADIENT) { QSvgGradientStyle *st = static_cast(prop); -- cgit v1.2.1 From 2f0fabdfc33d7ceed43fe3c543473081f51c4ec3 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Wed, 8 Oct 2014 13:47:36 +0200 Subject: Doc: Applied title case to section1 titles Task-number: QTBUG-41250 Change-Id: I32a25f6c524503cf6de5e9349d4817747bafe076 Reviewed-by: Martin Smith --- src/svg/doc/src/svgrendering.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/svg/doc/src/svgrendering.qdoc b/src/svg/doc/src/svgrendering.qdoc index 3ef66d5..eb8a365 100644 --- a/src/svg/doc/src/svgrendering.qdoc +++ b/src/svg/doc/src/svgrendering.qdoc @@ -40,7 +40,7 @@ \snippet doc_src_qtsvg.pro 1 - \section1 Rendering SVG files + \section1 Rendering SVG Files Scalable Vector Graphics (SVG) is a language for describing two-dimensional graphics and graphical applications in XML. SVG 1.1 is a W3C Recommendation -- cgit v1.2.1