| Index: extensions/renderer/script_context.cc
|
| diff --git a/extensions/renderer/script_context.cc b/extensions/renderer/script_context.cc
|
| index 97e6c763be0fd1b3f3ecfea237e437f6a1ae782c..3b6fbbf4cfdda79f7b3399e1a591f94e7b18d385 100644
|
| --- a/extensions/renderer/script_context.cc
|
| +++ b/extensions/renderer/script_context.cc
|
| @@ -189,10 +189,10 @@ GURL ScriptContext::GetEffectiveDocumentURL(const blink::WebFrame* frame,
|
| const blink::WebFrame* parent = frame;
|
| do {
|
| parent = parent->parent() ? parent->parent() : parent->opener();
|
| - } while (parent != NULL &&
|
| + } while (parent != NULL && !parent->document().isNull() &&
|
| GURL(parent->document().url()).SchemeIs(url::kAboutScheme));
|
|
|
| - if (parent) {
|
| + if (parent && !parent->document().isNull()) {
|
| // Only return the parent URL if the frame can access it.
|
| const blink::WebDocument& parent_document = parent->document();
|
| if (frame->document().securityOrigin().canAccess(
|
|
|