xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when a client sends a packet advertising a wrong size

Browse Source 
If the given size is less than the header size, the message is
clearly invalid, disconnect the client in that case.
This commit is contained in:
Maxime Coste 2016-12-01 19:45:23 +00:00
parent 7defdd3039
commit 95c1528342
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/remote.cc
View File

@ -153,7 +153,11 @@ public:
m_stream.resize(header_size); m_stream.resize(header_size);
read_from_socket(sock, header_size - m_write_pos); read_from_socket(sock, header_size - m_write_pos);
if (m_write_pos == header_size) if (m_write_pos == header_size)
{
if (size() < header_size)
throw remote_error{"invalid message received"};
m_stream.resize(size()); m_stream.resize(size());
}
} }
else else
read_from_socket(sock, size() - m_write_pos); read_from_socket(sock, size() - m_write_pos);
@ -234,6 +238,7 @@ public:
private: private:
void read_from_socket(int sock, size_t size) void read_from_socket(int sock, size_t size)
{ {
kak_assert(m_write_pos + size <= m_stream.size());
int res = ::read(sock, m_stream.data() + m_write_pos, size); int res = ::read(sock, m_stream.data() + m_write_pos, size);
if (res <= 0) if (res <= 0)
throw remote_error{res ? "peer disconnected" throw remote_error{res ? "peer disconnected"