Skip to content

Linux compiler fixes for Clang and GCC when using -Werror #2

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

Open
ckane wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Linux compiler fixes for Clang and GCC when using -Werror #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f5900f
Initialize inner struct with its own brackets
ckane Nov 5, 2021
d9c6c2e
Cast prevLastEventOffset to ulong before comparison
ckane Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion UnitTests/rules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2223,7 +2223,7 @@ TEST( Rules, ProcessEventRules )
SCOPED_TRACE( fieldValues.Description );
PWCHAR ruleName = NULL;
LARGE_INTEGER eventTime;
SYSMON_DATA_DESCRIPTOR eventBuffer[SYSMON_MAX_EVENT_Fields] = { (NativeTypes)0 };
SYSMON_DATA_DESCRIPTOR eventBuffer[SYSMON_MAX_EVENT_Fields] = {{(NativeTypes) 0}};

// Set all fields in the event buffer, the rest won't be available.
for( auto& field : fieldValues.Fields ) {
Expand Down
16 changes: 8 additions & 8 deletions eventsCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ void GenerateUniqueSGUID(
)
{
GUID g;
LARGE_INTEGER timestamp = {0,};
LARGE_INTEGER timestamp = {{0}};
#if defined _WIN64 || defined _WIN32
NTSTATUS status;
PSECURITY_LOGON_SESSION_DATA sessionData;
Expand Down Expand Up @@ -2114,7 +2114,7 @@ ProcessEventRulesDry(
)
{
ULONG index;
EVENT_DATA_DESCRIPTOR output[SYSMON_MAX_EVENT_Fields] = {0,};
EVENT_DATA_DESCRIPTOR output[SYSMON_MAX_EVENT_Fields] = {{0}};
RuleDefaultType ret;

ret = ProcessEventRules( EventTime, EventType, EventBuffer, EventData, output, RuleName, NULL );
Expand Down Expand Up @@ -2172,12 +2172,12 @@ EventProcess(
RuleDefaultType ruleDefault;
DWORD error = ERROR_SUCCESS;
InTypes outputType;
EVENT_DATA_DESCRIPTOR Output[SYSMON_MAX_EVENT_Fields] = {0,};
EVENT_DATA_DESCRIPTOR Output[SYSMON_MAX_EVENT_Fields] = {{0}};
LARGE_INTEGER currentTime;
PLARGE_INTEGER eventTime = NULL;
PWCHAR ruleName = NULL;
#if defined _WIN64 || defined _WIN32
PTCHAR OutStr[SYSMON_MAX_EVENT_Fields] = {0,};
PTCHAR OutStr[SYSMON_MAX_EVENT_Fields] = {{0}};
#elif defined __linux__
size_t eventMax = 65536;
char event[eventMax];
Expand Down Expand Up @@ -2666,7 +2666,7 @@ DWORD DispatchEvent(
PTCHAR companyName, fileVersion, productName, fileDescription, originalFileName;
PTCHAR id = NULL, message = NULL;
GUID guid;
SYSMON_DATA_DESCRIPTOR eventBuffer[SYSMON_MAX_EVENT_Fields] = {(NativeTypes) 0};
SYSMON_DATA_DESCRIPTOR eventBuffer[SYSMON_MAX_EVENT_Fields] = {{(NativeTypes) 0}};
PSYSMON_PROCESS_ACCESS processAccess;
PSYSMON_EVENT_TYPE_FMT eventType;
PSYSMON_FILE_DELETE fileDelete;
Expand Down Expand Up @@ -3244,7 +3244,7 @@ DWORD NetworkEvent(
_In_ const TCHAR* dstPortname
)
{
SYSMON_DATA_DESCRIPTOR eventBuffer[SYSMON_MAX_EVENT_Fields] = {(NativeTypes) 0};
SYSMON_DATA_DESCRIPTOR eventBuffer[SYSMON_MAX_EVENT_Fields] = {{(NativeTypes) 0}};

EventSetFieldX( eventBuffer, F_NC_UtcTime, N_LargeTime, *Time );
EventSetFieldX( eventBuffer, F_NC_ProcessGuid, N_ProcessId, OwnerPID );
Expand Down Expand Up @@ -3281,7 +3281,7 @@ DWORD SendStateEvent(
_In_ PTCHAR FileVersion
)
{
SYSMON_DATA_DESCRIPTOR eventBuffer[SYSMON_MAX_EVENT_Fields] = {(NativeTypes) 0};
SYSMON_DATA_DESCRIPTOR eventBuffer[SYSMON_MAX_EVENT_Fields] = {{(NativeTypes) 0}};
TCHAR schemaVersion[64];

_stprintf_s( schemaVersion, _countof(schemaVersion), _T("%.2f"), TO_DOUBLE( ConfigurationVersion ) );
Expand All @@ -3305,7 +3305,7 @@ DWORD SendConfigEvent(
_In_ PTCHAR ConfigHash
)
{
SYSMON_DATA_DESCRIPTOR eventBuffer[SYSMON_MAX_EVENT_Fields] = { (NativeTypes) 0 };
SYSMON_DATA_DESCRIPTOR eventBuffer[SYSMON_MAX_EVENT_Fields] = {{(NativeTypes) 0}};

EventSetFieldS( eventBuffer, F_SCC_Configuration, ConfigPath, FALSE );
EventSetFieldS( eventBuffer, F_SCC_ConfigurationFileHash, ConfigHash ? ConfigHash : _T(""), FALSE );
Expand Down
6 changes: 3 additions & 3 deletions xml.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ class RuleBuilder
// No entry so the blob is not set
//
D_ASSERT( blob == NULL );
RULE_REG_EXT baseRule = {0,};
RULE_REG_EXT baseRule = {{0}};

baseRule.header.Version = blobVersion;
baseRule.RuleRegSize = sizeof(baseRule);
Expand Down Expand Up @@ -353,7 +353,7 @@ class RuleBuilder

HRESULT UndoEventAdd()
{
if( lastEventOffset == 0 || prevLastEventOffset == ULONG_MAX ) {
if( lastEventOffset == 0 || (unsigned long)prevLastEventOffset == ULONG_MAX ) {

// Can't undo more than the very last event (no undo history).
return E_OUTOFMEMORY;
Expand Down Expand Up @@ -1056,7 +1056,7 @@ ApplyConfigurationFile(
ULONG version = 0;
PCONFIGURATION_OPTION_TYPE option;
PSYSMON_EVENT_TYPE_FMT rule = NULL;
ADD_RULES addRules[10] = {0,};
ADD_RULES addRules[10] = {{0}};
ULONG aggregationId = 0;
#if defined _WIN64 || defined _WIN32
char fileName[MAX_PATH];
Expand Down