Add NULL-checks to plugin delegate message handlers

Add NULL-checks to plugin delegate message handlers

The handlers for messages that originate from render_view, rather than being results of actions started by the plugin itself, can't assume that plugin initialization succeeded.

BUG=57085
TEST=Plugins that don't load shouldn't crash.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=60712

[brettw, 2010-09-27 21:47:17]

LGTM

On Mon, Sep 27, 2010 at 2:45 PM,  <stuartmorgan@chromium.org> wrote:
> Reviewers: brettw,
>
> Description:
> Add NULL-checks to plugin delegate message handlers
>
> The handlers for messages that originate from render_view, rather than being
> results of actions started by the plugin itself, can't assume that plugin
> initialization succeeded.
>
> BUG=57085
> TEST=Plugins that don't load shouldn't crash.
>
> Please review this at http://codereview.chromium.org/3404024/show
>
> Affected files:
>  M chrome/plugin/webplugin_delegate_stub.cc
>
>
> Index: chrome/plugin/webplugin_delegate_stub.cc
> diff --git a/chrome/plugin/webplugin_delegate_stub.cc
> b/chrome/plugin/webplugin_delegate_stub.cc
> index
>
8e74aa7df290a6a4e4cb82cf67ed748a6d12837e..17f02222b28887e3e0f17ab1d65f5d94244334ba
> 100644
> --- a/chrome/plugin/webplugin_delegate_stub.cc
> +++ b/chrome/plugin/webplugin_delegate_stub.cc
> @@ -337,29 +337,35 @@ void
> WebPluginDelegateStub::OnSendJavaScriptStream(const GURL& url,
>  }
>
>  void WebPluginDelegateStub::OnSetContentAreaFocus(bool has_focus) {
> -  delegate_->SetContentAreaHasFocus(has_focus);
> +  if (delegate_)
> +    delegate_->SetContentAreaHasFocus(has_focus);
>  }
>
>  #if defined(OS_MACOSX)
>  void WebPluginDelegateStub::OnSetWindowFocus(bool has_focus) {
> -  delegate_->SetWindowHasFocus(has_focus);
> +  if (delegate_)
> +    delegate_->SetWindowHasFocus(has_focus);
>  }
>
>  void WebPluginDelegateStub::OnContainerHidden() {
> -  delegate_->SetContainerVisibility(false);
> +  if (delegate_)
> +    delegate_->SetContainerVisibility(false);
>  }
>
>  void WebPluginDelegateStub::OnContainerShown(gfx::Rect window_frame,
>                                              gfx::Rect view_frame,
>                                              bool has_focus) {
> -  delegate_->WindowFrameChanged(window_frame, view_frame);
> -  delegate_->SetContainerVisibility(true);
> -  delegate_->SetWindowHasFocus(has_focus);
> +  if (delegate_) {
> +    delegate_->WindowFrameChanged(window_frame, view_frame);
> +    delegate_->SetContainerVisibility(true);
> +    delegate_->SetWindowHasFocus(has_focus);
> +  }
>  }
>
>  void WebPluginDelegateStub::OnWindowFrameChanged(const gfx::Rect&
> window_frame,
>                                                  const gfx::Rect&
> view_frame) {
> -  delegate_->WindowFrameChanged(window_frame, view_frame);
> +  if (delegate_)
> +    delegate_->WindowFrameChanged(window_frame, view_frame);
>  }
>  #endif  // OS_MACOSX
>
>
>
>