summaryrefslogtreecommitdiffstats
path: root/WebCore/dom
diff options
context:
space:
mode:
authorLeon Clarke <leonclarke@google.com>2010-01-14 16:39:36 +0000
committerLeon Clarke <leonclarke@google.com>2010-01-14 16:39:36 +0000
commit799b678747c2f2917292cff62a9f40a661bf2280 (patch)
tree8d9105d23ad9844213907c9394ddc9639d841296 /WebCore/dom
parent54432b29eb93b7be82c6306805f07b06ca9311b6 (diff)
downloadexternal_webkit-799b678747c2f2917292cff62a9f40a661bf2280.zip
external_webkit-799b678747c2f2917292cff62a9f40a661bf2280.tar.gz
external_webkit-799b678747c2f2917292cff62a9f40a661bf2280.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/dom')
-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 13c2fae..69b326a 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -2257,7 +2257,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