[WIN] Fix: crash when Back/Forward key is received

rogerwang · rogerwang · commit 06866139940b · 2013-11-21T21:40:50.000+08:00
diff --git a/src/api/menu/menu_delegate_win.cc b/src/api/menu/menu_delegate_win.cc
@@ -47,6 +47,8 @@ bool MenuDelegate::IsCommandIdEnabled(int command_id) const {
     return false;
 
   MenuItem* item = dispatcher_host_->GetApiObject<MenuItem>(command_id);
+  if (!item)
+    return false;
   return item->is_enabled_;
 }
 
@@ -55,6 +57,8 @@ bool MenuDelegate::IsItemForCommandIdDynamic(int command_id) const {
     return false;
 
   MenuItem* item = dispatcher_host_->GetApiObject<MenuItem>(command_id);
+  if (!item)
+    return false;
   return item->is_modified_;
 }
 
@@ -66,6 +70,8 @@ string16 MenuDelegate::GetLabelForCommandId(int command_id) const {
 bool MenuDelegate::GetIconForCommandId(int command_id,
                                        gfx::Image* icon) const {
   MenuItem* item = dispatcher_host_->GetApiObject<MenuItem>(command_id);
+  if (!item)
+    return false;
   if (item->icon_.IsEmpty())
     return false;
 
@@ -78,6 +84,8 @@ void MenuDelegate::ExecuteCommand(int command_id, int event_flags) {
     return;
 
   MenuItem* item = dispatcher_host_->GetApiObject<MenuItem>(command_id);
+  if (!item)
+    return;
   item->OnClick();
 }
 
@@ -86,6 +94,8 @@ bool MenuDelegate::HasIcon(int command_id) {
     return false;
 
   MenuItem* item = dispatcher_host_->GetApiObject<MenuItem>(command_id);
+  if (!item)
+    return false;
   return !item->icon_.IsEmpty();
 }
 
