hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Assorted bugfixes to DTSC and Socket libraries.

Browse source
This commit is contained in:
Thulinma 2013-02-19 16:06:39 +01:00
parent 603376d15a
commit 1baff448f2
3 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/dtsc.cpp
View file

@ -48,7 +48,9 @@ bool DTSC::Stream::parsePacket(std::string & buffer){
unsigned int i = 0;
metadata = JSON::fromDTMI((unsigned char*)buffer.c_str() + 8, len, i);
buffer.erase(0, len + 8);
return false;
if (buffer.length() <= 8){
return false;
}
}
if (memcmp(buffer.c_str(), DTSC::Magic_Packet, 4) == 0){
len = ntohl(((uint32_t *)buffer.c_str())[1]);
@ -120,7 +122,10 @@ bool DTSC::Stream::parsePacket(Socket::Buffer & buffer){
unsigned int i = 0;
std::string wholepacket = buffer.remove(len + 8);
metadata = JSON::fromDTMI((unsigned char*)wholepacket.c_str() + 8, len, i);
return false;
if (!buffer.available(8)){
return false;
}
header_bytes = buffer.copy(8);
}
if (memcmp(header_bytes.c_str(), DTSC::Magic_Packet, 4) == 0){
len = ntohl(((uint32_t *)header_bytes.c_str())[1]);