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

[tracking] No sigsegv in case of a wrong packet.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2020-05-27 16:24:15 +03:00 • committed by mpimenov
parent 0a729e29d3
commit 928e42f90f
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tracking/protocol.cpp
View file

@ -1,9 +1,11 @@
#include "tracking/protocol.hpp"
#include "coding/endianness.hpp"
#include "coding/reader.hpp"
#include "coding/writer.hpp"
#include "base/assert.hpp"
#include "base/logging.hpp"
#include <sstream>
@ -101,19 +103,27 @@ string Protocol::DecodeAuthPacket(Protocol::PacketType type, vector<uint8_t> con
Protocol::DataElementsVec Protocol::DecodeDataPacket(PacketType type, vector<uint8_t> const & data)
{
DataElementsVec points;
MemReader memReader(data.data(), data.size());
ReaderSource<MemReader> src(memReader);
switch (type)
MemReaderWithExceptions memReader(data.data(), data.size());
ReaderSource<MemReaderWithExceptions> src(memReader);
try
{
case Protocol::PacketType::DataV0:
Encoder::DeserializeDataPoints(0 /* version */, src, points);
break;
case Protocol::PacketType::DataV1:
Encoder::DeserializeDataPoints(1 /* version */, src, points);
break;
case Protocol::PacketType::AuthV0: ASSERT(false, ("Not a DATA packet.")); break;
switch (type)
{
case Protocol::PacketType::DataV0:
Encoder::DeserializeDataPoints(0 /* version */, src, points);
break;
case Protocol::PacketType::DataV1:
Encoder::DeserializeDataPoints(1 /* version */, src, points);
break;
case Protocol::PacketType::AuthV0: ASSERT(false, ("Not a DATA packet.")); break;
}
return points;
}
catch (Reader::SizeException const & ex)
{
LOG(LERROR, ("Wrong packet. SizeException. Msg:", ex.Msg(), ". What:", ex.what()));
return {};
}
return points;
}
// static