kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Merge pull request #3357 from ygorshenin/fix-crash-in-search

Browse source 
[search] Fixed crash in postcodes search.
This commit is contained in:
mpimenov 2016-05-27 13:16:06 +04:00
commit 000381c11a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
search/v2/geocoder.cpp
View file

@ -222,7 +222,8 @@ void JoinQueryTokens(QueryParams const & params, size_t curToken, size_t endToke
}
else
{
ASSERT_EQUAL(i, params.m_tokens.size(), ());
CHECK_EQUAL(i, params.m_tokens.size(), ());
CHECK(!params.m_prefixTokens.empty(), ());
res.append(params.m_prefixTokens.front());
}
@ -1045,17 +1046,18 @@ void Geocoder::WithPostcodes(TFn && fn)
auto postcodes =
RetrievePostcodeFeatures(*m_context, TokenSlice(m_params, startToken, endToken));
MY_SCOPE_GUARD(cleanup, [&]() { m_postcodes.Clear(); });
if (!coding::CompressedBitVector::IsEmpty(postcodes))
{
ScopedMarkTokens mark(m_usedTokens, startToken, endToken);
m_postcodes.Clear();
m_postcodes.m_startToken = startToken;
m_postcodes.m_endToken = endToken;
m_postcodes.m_features = move(postcodes);
fn();
m_postcodes.Clear();
}
}
}