summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-07 17:36:52 +0000
committerdubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-07 17:36:52 +0000
commit8b1b2fcaa771843a275931b1abcde5edaf8d3504 (patch)
treed160d0d87febf032a768e0bcea959ace34bfb87f
parentfdc3835745175764c2ce3fb3829fbc2e9cdd6b05 (diff)
downloadchromium_src-8b1b2fcaa771843a275931b1abcde5edaf8d3504.zip
chromium_src-8b1b2fcaa771843a275931b1abcde5edaf8d3504.tar.gz
chromium_src-8b1b2fcaa771843a275931b1abcde5edaf8d3504.tar.bz2
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
-rw-r--r--chrome/browser/ui/webui/ntp/foreign_session_handler.cc2
1 files changed, 2 insertions, 0 deletions
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) {