Merge pull request #947 from /issues/2213

correctly delete fetchers
brave · Nov 22, 2018 · 3c2f5d9 · 3c2f5d9
2 parents 5f08d56 + 6aecd22
commit 3c2f5d9
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc
@@ -521,7 +521,11 @@ void RewardsServiceImpl::Shutdown() {
  }
  }
 
+ for (const auto fetcher : fetchers_) {
+ delete fetcher.first;
+ }
  fetchers_.clear();
+
  ledger_.reset();
  RewardsService::Shutdown();
 }
@@ -873,11 +877,14 @@ std::unique_ptr<ledger::LedgerURLLoader> RewardsServiceImpl::LoadURL(
 
 void RewardsServiceImpl::OnURLFetchComplete(
  const net::URLFetcher* source) {
- if (fetchers_.find(source) == fetchers_.end())
+ if (fetchers_.find(source) == fetchers_.end()) {
+ delete source;
  return;
+ }
 
  auto callback = fetchers_[source];
  fetchers_.erase(source);
+
  int response_code = source->GetResponseCode();
  std::string body;
  std::map<std::string, std::string> headers;
@@ -898,6 +905,8 @@ void RewardsServiceImpl::OnURLFetchComplete(
  source->GetResponseAsString(&body);
  }
 
+ delete source;
+
  callback.Run(response_code, body, headers);
 }