From 8b1b2fcaa771843a275931b1abcde5edaf8d3504 Mon Sep 17 00:00:00 2001 From: "dubroy@chromium.org" Date: Mon, 7 May 2012 17:36:52 +0000 Subject: NTP: Fix possible segfault in Other Devices menu. TBR=estade@chromium.org BUG=None TEST=None Review URL: https://chromiumcodereview.appspot.com/10387009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135668 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/webui/ntp/foreign_session_handler.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc index 37e1062..021e6b9 100644 --- a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc +++ b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc @@ -197,6 +197,8 @@ void ForeignSessionHandler::HandleOpenForeignSession(const ListValue* args) { } SessionModelAssociator* associator = GetModelAssociator(); + if (!associator) + return; Profile* profile = Profile::FromWebUI(web_ui()); if (tab_id != kInvalidId) { -- cgit v1.1