Merge 106846 - Before accessing a frame's script controller in V8 bindings, first check that the ...

Source/WebCore/bindings/v8/ScriptCachedFrameData.cpp

 /*
  * Copyright 2010, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *  * Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *  * Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 41 matching lines @@
 DOMWindow* ScriptCachedFrameData::domWindow() const
 {
     return m_domWindow;
 }
 
 void ScriptCachedFrameData::restore(Frame* frame)
 {
     if (m_context.get().IsEmpty())
         return;
 
-    if (!frame->script()->canExecuteScripts(NotAboutToExecuteScript))
+    if (!frame || !frame->script()->canExecuteScripts(NotAboutToExecuteScript))
         return;
 
     v8::HandleScope handleScope;
     v8::Context::Scope contextScope(m_context.get());
 
     m_context.get()->ReattachGlobal(m_global.get());
     V8Proxy* proxy = V8Proxy::retrieve(frame);
     if (proxy)
         proxy->windowShell()->setContext(m_context.get());
 }
 
 void ScriptCachedFrameData::clear()
 {
     m_context.clear();
     m_global.clear();
 }
 
 } // namespace WebCore
 
 #endif // PLATFORM(QT)