organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

PR fixes

Browse source
This commit is contained in:
Lev Dragunov 2015-08-24 19:13:34 +03:00 • committed by Alex Zolotarev
parent 9233a16aeb
commit 64c1eb8feb
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
search/query_saver.cpp
View file

@ -10,10 +10,18 @@
namespace
{
size_t constexpr kMaxSuggestCount = 10;
char constexpr kSettingsKey[] = "UserQueries";
using TLength = uint16_t;
TLength constexpr kMaxSuggestCount = 10;
size_t constexpr kLengthTypeSize = sizeof(TLength);
bool ReadLength(ReaderSource<MemReader> & reader, TLength & length)
{
if (reader.Size() < kLengthTypeSize)
return false;
reader.Read(&length, kLengthTypeSize);
return true;
}
} // namespace
namespace search
@ -74,29 +82,23 @@ void QuerySaver::Deserialize(string const & data)
MemReader rawReader(decodedData.c_str(), decodedData.size());
ReaderSource<MemReader> reader(rawReader);
if (reader.Size() < kLengthTypeSize)
{
EmergencyReset();
return;
}
TLength queriesCount;
reader.Read(&queriesCount, kLengthTypeSize);
if (queriesCount > kMaxSuggestCount)
if (!ReadLength(reader, queriesCount))
{
EmergencyReset();
return;
}
queriesCount = min(queriesCount, kMaxSuggestCount);
for (TLength i = 0; i < queriesCount; ++i)
{
TLength stringLength;
if (reader.Size() < kLengthTypeSize)
if (!ReadLength(reader, stringLength))
{
EmergencyReset();
return;
}
reader.Read(&stringLength, kLengthTypeSize);
if (reader.Size() < stringLength)
{
EmergencyReset();