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

#6716 Changed throw to pass exception to caller and handle it there updated debug message

Browse source
This commit is contained in:
Jamie Newbon 2020-07-14 12:51:44 +01:00
parent 59e63f5818
commit bdd36c389d
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
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;
} }
@ -222,8 +225,8 @@ ProtocolUtil::vreadf(synergy::IStream* stream, const char* fmt, va_list args)
catch (std::bad_alloc & exception) { catch (std::bad_alloc & exception) {
// Added try catch due to GHSA-chfm-333q-gfpp // Added try catch due to GHSA-chfm-333q-gfpp
LOG((CLOG_ERR "ALLOC: Unable to allocate memory %d bytes", len)); LOG((CLOG_ERR "ALLOC: Unable to allocate memory %d bytes", len));
LOG((CLOG_DEBUG "bad_alloc detected: %s", exception.what())); LOG((CLOG_DEBUG "bad_alloc detected: Do you have enough free memory?"));
throw; throw exception;
} }
} }