From 2c4e7ae70f68eecf56707f0ebd9810340f41e6a3 Mon Sep 17 00:00:00 2001 From: Ivo van Dongen Date: Mon, 28 Nov 2016 17:35:10 +0200 Subject: =?UTF-8?q?[core]=20guard=20against=20duplicate=20source=20id?= =?UTF-8?q?=E2=80=99s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mbgl/style/style.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src') diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index d57f5cf98e..e55119f9fd 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -136,6 +136,16 @@ void Style::setJSON(const std::string& json) { } void Style::addSource(std::unique_ptr source) { + //Guard against duplicate source ids + auto it = std::find_if(sources.begin(), sources.end(), [&](const auto& existing) { + return existing->getID() == source->getID(); + }); + + if (it != sources.end()) { + std::string msg = "Source " + source->getID() + " already exists"; + throw std::runtime_error(msg.c_str()); + } + source->baseImpl->setObserver(this); sources.emplace_back(std::move(source)); } -- cgit v1.2.1