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

SYNERGY-956 - Resolve code scanning issues (#7006)

Browse source 
* SYNERGY-956 - Resolve code scanning issues

* SYNERGY-956 - Update changelog

* SYNERGY-956 - Platform based localtime

* SYNERGY-956 - Fix argument order

Co-authored-by: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com>
This commit is contained in:
Igor Sikachyna 2021-05-26 02:39:40 -07:00 committed by GitHub
parent ab346d4832
commit c7fd0a8e4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -2,6 +2,7 @@ v1.14.1-snapshot
=========== ===========
Bug fixes: Bug fixes:
- #7016 Fix script that generates version number - #7016 Fix script that generates version number
- #7006 Resolve code scanning issues
Enhancements: Enhancements:

10
src/lib/base/Log.cpp
View file

@ -177,13 +177,17 @@ Log::print(const char* file, int line, const char* fmt, ...)
// do not prefix time and file for kPRINT (CLOG_PRINT) // do not prefix time and file for kPRINT (CLOG_PRINT)
if (priority != kPRINT) { if (priority != kPRINT) {
struct tm *tm; struct tm tm;
static const int timestamp_size = 50; static const int timestamp_size = 50;
char timestamp[timestamp_size]; char timestamp[timestamp_size];
time_t t; time_t t;
time(&t); time(&t);
tm = localtime(&t); #if WINAPI_MSWINDOWS
snprintf(timestamp, timestamp_size, "%04i-%02i-%02iT%02i:%02i:%02i", tm->tm_year + 1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); localtime_s(&tm, &t);
#else
localtime_r(&t, &tm);
#endif
snprintf(timestamp, timestamp_size, "%04i-%02i-%02iT%02i:%02i:%02i", tm.tm_year + 1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
// square brackets, spaces, comma and null terminator take about 10 // square brackets, spaces, comma and null terminator take about 10
int size = 10; int size = 10;

2
src/lib/server/InputFilter.cpp
View file

@ -497,7 +497,7 @@ InputFilter::KeyboardBroadcastAction::format() const
} }
else { else {
return synergy::string::sprintf("%s(%s,%.*s)", s_name, s_mode[m_mode], return synergy::string::sprintf("%s(%s,%.*s)", s_name, s_mode[m_mode],
m_screens.size() - 2, static_cast<int>(m_screens.size() >= 2 ? m_screens.size() - 2 : 0),
m_screens.c_str() + 1); m_screens.c_str() + 1);
} }
} }

4
src/test/unittests/synergy/ProtocolUtilTests.cpp
View file

@ -56,7 +56,7 @@ MATCHER_P(EqVoidPointeeInt32, expected, "")
MATCHER_P(EqVoidVectorInt1byte, expected, "") MATCHER_P(EqVoidVectorInt1byte, expected, "")
{ {
bool Result = true; bool Result = true;
const UInt8* Actual = (static_cast<const UInt8*>(arg)) + sizeof (UInt32); const UInt8* Actual = (static_cast<const UInt8*>(arg)) + 4;
const size_t Size = *(Actual - 1); const size_t Size = *(Actual - 1);
if (Size == expected.size()){ if (Size == expected.size()){
@ -77,7 +77,7 @@ MATCHER_P(EqVoidVectorInt1byte, expected, "")
MATCHER_P(EqVoidVectorInt2bytes, expected, "") MATCHER_P(EqVoidVectorInt2bytes, expected, "")
{ {
bool Result = true; bool Result = true;
const UInt16* Actual = (static_cast<const UInt16*>(arg)) + sizeof (UInt16); const UInt16* Actual = (static_cast<const UInt16*>(arg)) + 2;
const size_t Size = *(Actual - 1) >> 8; const size_t Size = *(Actual - 1) >> 8;
if (Size == expected.size()){ if (Size == expected.size()){