summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Clarke <leonclarke@google.com>2010-06-23 14:30:10 +0100
committerLeon Clarke <leonclarke@google.com>2010-06-23 14:30:10 +0100
commit1b7019689392c62db7283d1378025c2835765a85 (patch)
tree0befadb7ee3a5509d718f8a6a61ea1cd9ac2aa0d
parent25fc164b1f2d0071cbc4210174198cf537ac7a0f (diff)
downloadexternal_webkit-1b7019689392c62db7283d1378025c2835765a85.zip
external_webkit-1b7019689392c62db7283d1378025c2835765a85.tar.gz
external_webkit-1b7019689392c62db7283d1378025c2835765a85.tar.bz2
Don't dereference the frame when there isn't one in rel=apple-touch-icon links
http://b/issue?id=2789499 Change-Id: I392825d357057c02cd379228fcfaa23ff7616378
-rw-r--r--WebCore/html/HTMLLinkElement.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp
index e5f7b26..a687852 100644
--- a/WebCore/html/HTMLLinkElement.cpp
+++ b/WebCore/html/HTMLLinkElement.cpp
@@ -207,7 +207,7 @@ void HTMLLinkElement::process()
#ifdef ANDROID_APPLE_TOUCH_ICON
if ((m_relAttribute.m_isTouchIcon || m_relAttribute.m_isPrecomposedTouchIcon) && m_url.isValid()
- && !m_url.isEmpty())
+ && !m_url.isEmpty() && document()->frame())
document()->frame()->loader()->client()
->dispatchDidReceiveTouchIconURL(m_url.string(),
m_relAttribute.m_isPrecomposedTouchIcon);