pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #4739 from ygorshenin/fix-search-ub

Browse source 
[search] Fixed UB in search query cleanup.
This commit is contained in:
mgsergio 2016-11-17 13:55:39 +03:00 • committed by GitHub
commit e9bff8cd86
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
search/geocoder.cpp
View file

@ -382,12 +382,11 @@ void Geocoder::SetParams(Params const & params)
// Filter stop words.
if (m_params.m_tokens.size() > 1)
{
for (auto & v : m_params.m_tokens)
my::EraseIf(v, &IsStopWord);
for (size_t i = 0; i < m_params.GetNumTokens();)
for (size_t i = 0; i < m_params.m_tokens.size();)
{
if (m_params.m_tokens[i].empty())
auto & tokens = m_params.m_tokens[i];
my::EraseIf(tokens, &IsStopWord);
if (tokens.empty())
m_params.RemoveToken(i);
else
++i;