arc: Fix the string_view dangling pointer issue

This CL create a new string when binding callback. BUG=b:310260986 TEST=ArcAppLaunchThrottleObserverTest Change-Id: I69074b817323b28baf1648e7296296a5a853bc77 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5019669 Commit-Queue: Shengsong Tan <[email protected]> Reviewed-by: Yuichiro Hanada <[email protected]> Reviewed-by: Alexandre Marciano Gimenez <[email protected]> Cr-Commit-Position: refs/heads/main@{#1224042}
Igalia · Nov 14, 2023 · a50d8f6 · a50d8f6
1 parent f9ce056
commit a50d8f6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_app_launch_throttle_observer.cc b/chrome/browser/ash/arc/instance_throttle/arc_app_launch_throttle_observer.cc
@@ -90,7 +90,7 @@ void ArcAppLaunchThrottleObserver::OnWillDestroyWatcher() {
 }
 
 void ArcAppLaunchThrottleObserver::OnLaunchedOrRequestExpired(
-    const std::string& name) {
+    const std::string name) {
   // This request has already expired or there are outstanding requests,
   // do not deactivate the observer.
   if (!current_requests_.erase(name) || current_requests_.size())

diff --git a/chrome/browser/ash/arc/instance_throttle/arc_app_launch_throttle_observer.h b/chrome/browser/ash/arc/instance_throttle/arc_app_launch_throttle_observer.h
@@ -59,7 +59,7 @@ class ArcAppLaunchThrottleObserver
   void OnWillDestroyWatcher() override;
 
  private:
-  void OnLaunchedOrRequestExpired(const std::string& name);
+  void OnLaunchedOrRequestExpired(const std::string name);
 
   std::set<std::string> current_requests_;
 

diff --git a/chrome/browser/ash/arc/instance_throttle/arc_app_launch_throttle_observer_unittest.cc b/chrome/browser/ash/arc/instance_throttle/arc_app_launch_throttle_observer_unittest.cc
@@ -148,5 +148,14 @@ TEST_F(ArcAppLaunchThrottleObserverTest, TestWindowWatcherEffectOnInit) {
   }
 }
 
+TEST_F(ArcAppLaunchThrottleObserverTest, TestCallbackString) {
+  auto temp_id = std::make_unique<std::string>("test_app_id");
+  observer()->OnArcAppLaunchRequested(*temp_id);
+  temp_id.reset();
+
+  // Expect no crash & memory leak.
+  environment()->FastForwardUntilNoTasksRemain();
+}
+
 }  // namespace
 }  // namespace arc