diff options
Diffstat (limited to 'webkit/plugins/ppapi/ppb_flash_menu_impl.cc')
| -rw-r--r-- | webkit/plugins/ppapi/ppb_flash_menu_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/plugins/ppapi/ppb_flash_menu_impl.cc b/webkit/plugins/ppapi/ppb_flash_menu_impl.cc index f41e941..52f81b6 100644 --- a/webkit/plugins/ppapi/ppb_flash_menu_impl.cc +++ b/webkit/plugins/ppapi/ppb_flash_menu_impl.cc @@ -72,13 +72,13 @@ bool ConvertMenuData(const PP_Flash_Menu* in_menu, size_t depth, PPB_Flash_Menu_Impl::MenuData* out_menu, std::vector<int32_t>* menu_id_map) { - if (depth > kMaxMenuDepth) + if (depth > kMaxMenuDepth || !in_menu) return false; // Clear the output, just in case. out_menu->clear(); - if (!in_menu || !in_menu->count) + if (!in_menu->count) return true; // Nothing else to do. if (!in_menu->items || in_menu->count > kMaxMenuEntries) |