diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-01-15 04:04:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-15 04:04:35 -0800 |
| commit | 007b242311dbcb3b1b9c55af5beb38ccaca0e40b (patch) | |
| tree | fa15cdf645e169d0d22abf88056aa108f32d7cc2 /WebCore | |
| parent | 7c0867874e2a40013c795b99d5b1d7220a6a5d04 (diff) | |
| parent | 799b678747c2f2917292cff62a9f40a661bf2280 (diff) | |
| download | external_webkit-007b242311dbcb3b1b9c55af5beb38ccaca0e40b.zip external_webkit-007b242311dbcb3b1b9c55af5beb38ccaca0e40b.tar.gz external_webkit-007b242311dbcb3b1b9c55af5beb38ccaca0e40b.tar.bz2 | |
Merge "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.cpp | 3 |
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 |