Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(565)

Unified Diff: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc

Issue 2612453002: Fix memory corruption during launching an app from shortcut. (Closed)
Patch Set: Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
index 0db7cbbb30e40f1e41c5e8c760e68c7d37b91cd4..8c1bab2bffa323bd043f37508976b744e74f1424 100644
--- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
@@ -109,8 +109,11 @@ bool AppShortcutLauncherItemController::IsVisible() const {
void AppShortcutLauncherItemController::Launch(ash::LaunchSource source,
int event_flags) {
- launcher_controller()->LaunchAppWithLaunchId(app_id(), launch_id(), source,
- event_flags);
+ // Launching an app replaces shortcut item controller to app controller. As
+ // result app_id_, launch_id_ are deleted during this call. Use local copies
+ // to prevent crash condition.
+ launcher_controller()->LaunchAppWithLaunchId(
+ std::string(app_id()), std::string(launch_id()), source, event_flags);
}
ash::ShelfItemDelegate::PerformedAction
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698