Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-03 14:45:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2128 from PhenomRetroShare/Fix_RsItemDeserialiseTooSmall

Browse source 
Fix rs item deserialise too small
This commit is contained in:
csoler 2020-11-26 20:01:41 +01:00 • committed by GitHub
commit b820057064
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libretroshare/src/serialiser/rsserializer.cc
View file

@ -33,11 +33,16 @@
RsItem *RsServiceSerializer::deserialise(void *data, uint32_t *size) RsItem *RsServiceSerializer::deserialise(void *data, uint32_t *size)
{ {
if(!data || !size || !*size) if(!data || !size || *size < 8)
{ {
RsErr() << __PRETTY_FUNCTION__ << " Called with null paramethers data: " RsErr() << __PRETTY_FUNCTION__ << " Called with inconsistent parameters data: " << std::endl;
<< data << " size: " << static_cast<void*>(size) << " *size: " if(data)
<< (size ? *size : 0) << " this should never happen!" RsErr() << "Data is: " << RsUtil::BinToHex(static_cast<uint8_t*>(data),std::min(50u,*size)) << ((*size>50)?"...":"") << std::endl;
else
RsErr() << "Null Data" << std::endl;
RsErr() << " size: " << static_cast<void*>(size) << " *size: " << (size ? *size : 0) << std::endl
<< " this should never happen!"
<< std::endl; << std::endl;
print_stacktrace(); print_stacktrace();
return nullptr; return nullptr;