summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2013-06-05 18:46:07 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-06 09:41:20 +0200
commit50ccde81258f6d9f9147b8b1c52adb90db22cd3e (patch)
treedeb009f02a8f2cbd684b6c07ca7b8f65c47bf3d0
parent9769275688aec7a53b55b66bde961b18c32c6d51 (diff)
downloadqtwebkit-50ccde81258f6d9f9147b8b1c52adb90db22cd3e.tar.gz
Crash when loading link to audio file
https://bugs.webkit.org/show_bug.cgi?id=115794 Reviewed by Jocelyn Turcotte. Do not access a null pointer frame. * loader/appcache/ApplicationCacheHost.cpp: (WebCore::ApplicationCacheHost::isApplicationCacheEnabled): Change-Id: I1c7c8ea84394f669e565634f71720ae504ceded4 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@149733 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-rw-r--r--Source/WebCore/loader/appcache/ApplicationCacheHost.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp b/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp
index fe9f010a0..c4e743065 100644
--- a/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp
+++ b/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp
@@ -473,7 +473,7 @@ void ApplicationCacheHost::abort()
bool ApplicationCacheHost::isApplicationCacheEnabled()
{
- return m_documentLoader->frame()->settings()
+ return m_documentLoader->frame() && m_documentLoader->frame()->settings()
&& m_documentLoader->frame()->settings()->offlineWebApplicationCacheEnabled();
}