smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request from GHSA-chfm-333q-gfpp

Browse source 
Attempts to fis DoS to servers with less then 4GB memory
This commit is contained in:
Jnewbon 2020-07-14 13:14:40 +01:00 committed by GitHub
commit 0a97c2be0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/lib/synergy/ProtocolUtil.cpp
View file

@ -61,6 +61,9 @@ ProtocolUtil::readf(synergy::IStream* stream, const char* fmt, ...)
catch (XIO&) { catch (XIO&) {
result = false; result = false;
} }
catch (std::bad_alloc & exception) {
result = false;
}
va_end(args); va_end(args);
return result; return result;
} }
@ -216,7 +219,15 @@ ProtocolUtil::vreadf(synergy::IStream* stream, const char* fmt, va_list args)
// allocate a buffer to read the data // allocate a buffer to read the data
UInt8* sBuffer = buffer; UInt8* sBuffer = buffer;
if (!useFixed) { if (!useFixed) {
sBuffer = new UInt8[len]; try{
sBuffer = new UInt8[len];
}
catch (std::bad_alloc & exception) {
// Added try catch due to GHSA-chfm-333q-gfpp
LOG((CLOG_ERR "ALLOC: Unable to allocate memory %d bytes", len));
LOG((CLOG_DEBUG "bad_alloc detected: Do you have enough free memory?"));
throw exception;
}
} }
// read the data // read the data