diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-05-18 08:16:33 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-05-18 08:16:33 -0700 |
| commit | e0a6d7ef551937b2c95db5d6425195728b3ee24d (patch) | |
| tree | 1d6875377b36fd2245235b4c08d2a374fb5501a5 /WebCore | |
| parent | 09dca88f0da7c89ba4ae519c1c4f123cb0c279ff (diff) | |
| parent | d61ed3128baba7f0b859ffbc9be7b4bbf7c531c0 (diff) | |
| download | external_webkit-e0a6d7ef551937b2c95db5d6425195728b3ee24d.zip external_webkit-e0a6d7ef551937b2c95db5d6425195728b3ee24d.tar.gz external_webkit-e0a6d7ef551937b2c95db5d6425195728b3ee24d.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 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 |