Commit c0ca01a7 authored by spang's avatar spang Committed by Commit bot

ash: display: Safely delete color calibration data

Fix a crash due to unsafe iterator usage in the DisplayColorManager
destructor.

BUG=488487
TEST=compile

Review URL: https://codereview.chromium.org/1127213007

Cr-Commit-Position: refs/heads/master@{#330252}
parent 123b175f
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "base/format_macros.h" #include "base/format_macros.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "chromeos/chromeos_paths.h" #include "chromeos/chromeos_paths.h"
#include "chromeos/chromeos_switches.h" #include "chromeos/chromeos_switches.h"
...@@ -91,11 +92,7 @@ DisplayColorManager::DisplayColorManager(ui::DisplayConfigurator* configurator) ...@@ -91,11 +92,7 @@ DisplayColorManager::DisplayColorManager(ui::DisplayConfigurator* configurator)
DisplayColorManager::~DisplayColorManager() { DisplayColorManager::~DisplayColorManager() {
configurator_->RemoveObserver(this); configurator_->RemoveObserver(this);
STLDeleteValues(&calibration_map_);
for (auto it : calibration_map_) {
delete it.second;
calibration_map_.erase(it.first);
}
} }
void DisplayColorManager::OnDisplayModeChanged( void DisplayColorManager::OnDisplayModeChanged(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment