diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-19 12:00:31 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-19 12:07:15 (GMT) |
| commit | 8e401cd4ae0133531613a3e097acc57979d78f50 (patch) | |
| tree | 58e7572913a2c0d38af6a321fc44a5566a9b859d /src/3rdparty/webkit/WebCore | |
| parent | a1e1867ae3cac6b54cd06e9fc0ad1aa0b476fe9d (diff) | |
| parent | 732e0d01df867200546ddb5e6f8695f263e1ee0d (diff) | |
| download | Qt-8e401cd4ae0133531613a3e097acc57979d78f50.zip Qt-8e401cd4ae0133531613a3e097acc57979d78f50.tar.gz Qt-8e401cd4ae0133531613a3e097acc57979d78f50.tar.bz2 | |
Merge branch '4.6' of oslo-staging-1 into 4.6
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 15 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index abb372a..6daf411 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,18 @@ +2009-11-18 Benjamin Poulain <benjamin.poulain@nokia.com> + + Reviewed by Simon Hausmann. + + [Qt] WebKit crashes when loading certain SVG images + + Check if the familly exist before creating the PlatformData from it. + + https://bugs.webkit.org/show_bug.cgi?id=29443 + + Test: svg/text/text-font-invalid.html + + * platform/graphics/qt/FontFallbackListQt.cpp: + (WebCore::FontFallbackList::fontDataAt): + 2009-11-14 Antonio Gomes <tonikitoo@webkit.org> Reviewed by Antti Koivisto. diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp index 8e1e4f6..0306abf 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp @@ -102,7 +102,7 @@ const FontData* FontFallbackList::fontDataAt(const WebCore::Font* _font, unsigne const FontDescription& description = _font->fontDescription(); const FontFamily* family = &description.family(); while (family) { - if (m_fontSelector) { + if (family->family().length() && m_fontSelector) { FontData* data = m_fontSelector->getFontData(description, family->family()); if (data) { if (data->isLoading()) |