summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorLeon Clarke <leonclarke@google.com>2010-01-14 16:39:36 +0000
committerJean-Baptiste Queru <jbq@google.com>2010-05-13 13:43:12 -0700
commitd61ed3128baba7f0b859ffbc9be7b4bbf7c531c0 (patch)
tree286d00a0aeeb1b7b031671c0e6cb4fc65a8786e5 /WebCore
parentd84a638c00a2c66685f37e34ec513bb9c6acf488 (diff)
downloadexternal_webkit-d61ed3128baba7f0b859ffbc9be7b4bbf7c531c0.zip
external_webkit-d61ed3128baba7f0b859ffbc9be7b4bbf7c531c0.tar.gz
external_webkit-d61ed3128baba7f0b859ffbc9be7b4bbf7c531c0.tar.bz2
Check for the absence of a frame.
This crashes in the situation where the XHR responseXML method is being called on a document with meta tags. http://b/issue?id=2346028
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/dom/Document.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index e4c5741..ef5e69e 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -2146,7 +2146,8 @@ void Document::processMetadataSettings(const String& content)
String key(buffer.substring(keyBegin, keyEnd - keyBegin));
String value(buffer.substring(valueBegin, valueEnd - valueBegin));
- frame()->settings()->setMetadataSettings(key, value);
+ if (frame())
+ frame()->settings()->setMetadataSettings(key, value);
}
}
#endif