Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SYNERGY-956 - Resolve code scanning issues #7006

Merged
merged 7 commits into from
May 26, 2021
Merged

SYNERGY-956 - Resolve code scanning issues #7006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43a94d6
SYNERGY-956 - Resolve code scanning issues
igor-sikachyna May 19, 2021
3a13d67
SYNERGY-956 - Update changelog
igor-sikachyna May 19, 2021
63f4423
SYNERGY-956 - Platform based localtime
igor-sikachyna May 19, 2021
84ba2e1
SYNERGY-956 - Fix argument order
igor-sikachyna May 19, 2021
047ff29
Merge branch 'master' into SYNERGY-956-GitHub-code-scanning-issues
igor-sikachyna May 20, 2021
1727031
Merge branch 'master' into SYNERGY-956-GitHub-code-scanning-issues
igor-sikachyna May 20, 2021
dbb0898
Merge branch 'master' into SYNERGY-956-GitHub-code-scanning-issues
SerhiiGadzhilov May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ v1.14.1-snapshot
===========
Bug fixes:
- #7016 Fix script that generates version number
- #7006 Resolve code scanning issues

Enhancements:

Expand Down
10 changes: 7 additions & 3 deletions src/lib/base/Log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,17 @@ Log::print(const char* file, int line, const char* fmt, ...)
// do not prefix time and file for kPRINT (CLOG_PRINT)
if (priority != kPRINT) {

struct tm *tm;
struct tm tm;
static const int timestamp_size = 50;
char timestamp[timestamp_size];
time_t t;
time(&t);
tm = localtime(&t);
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);
#if WINAPI_MSWINDOWS
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
int size = 10;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/server/InputFilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ InputFilter::KeyboardBroadcastAction::format() const
}
else {
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);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/unittests/synergy/ProtocolUtilTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ MATCHER_P(EqVoidPointeeInt32, expected, "")
MATCHER_P(EqVoidVectorInt1byte, expected, "")
{
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);

if (Size == expected.size()){
Expand All @@ -77,7 +77,7 @@ MATCHER_P(EqVoidVectorInt1byte, expected, "")
MATCHER_P(EqVoidVectorInt2bytes, expected, "")
{
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;

if (Size == expected.size()){
Expand Down