diff --git a/channels/ainput/client/ainput_main.c b/channels/ainput/client/ainput_main.c index 0e3e96c62..1a2128dcc 100644 --- a/channels/ainput/client/ainput_main.c +++ b/channels/ainput/client/ainput_main.c @@ -54,8 +54,8 @@ struct AINPUT_PLUGIN_ */ static UINT ainput_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* data) { - UINT16 type; - AINPUT_PLUGIN* ainput; + UINT16 type = 0; + AINPUT_PLUGIN* ainput = NULL; GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; WINPR_ASSERT(callback); @@ -85,10 +85,10 @@ static UINT ainput_on_data_received(IWTSVirtualChannelCallback* pChannelCallback static UINT ainput_send_input_event(AInputClientContext* context, UINT64 flags, INT32 x, INT32 y) { - AINPUT_PLUGIN* ainput; - GENERIC_CHANNEL_CALLBACK* callback; + AINPUT_PLUGIN* ainput = NULL; + GENERIC_CHANNEL_CALLBACK* callback = NULL; BYTE buffer[32] = { 0 }; - UINT64 time; + UINT64 time = 0; wStream sbuffer = { 0 }; wStream* s = Stream_StaticInit(&sbuffer, buffer, sizeof(buffer)); diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c index 5e5d4af75..2e7e3c89d 100644 --- a/channels/ainput/server/ainput_main.c +++ b/channels/ainput/server/ainput_main.c @@ -89,9 +89,9 @@ static BOOL ainput_server_is_open(ainput_server_context* context) */ static UINT ainput_server_open_channel(ainput_server* ainput) { - DWORD Error; - HANDLE hEvent; - DWORD StartTick; + DWORD Error = 0; + HANDLE hEvent = NULL; + DWORD StartTick = 0; DWORD BytesReturned = 0; PULONG pSessionId = NULL; @@ -131,7 +131,7 @@ static UINT ainput_server_open_channel(ainput_server* ainput) if (ainput->ainput_channel) { - UINT32 channelId; + UINT32 channelId = 0; BOOL status = TRUE; channelId = WTSChannelGetIdByHandle(ainput->ainput_channel); @@ -158,8 +158,8 @@ static UINT ainput_server_open_channel(ainput_server* ainput) static UINT ainput_server_send_version(ainput_server* ainput) { - ULONG written; - wStream* s; + ULONG written = 0; + wStream* s = NULL; WINPR_ASSERT(ainput); @@ -191,10 +191,10 @@ static UINT ainput_server_send_version(ainput_server* ainput) static UINT ainput_server_recv_mouse_event(ainput_server* ainput, wStream* s) { UINT error = CHANNEL_RC_OK; - UINT64 flags; - UINT64 time; - INT32 x; - INT32 y; + UINT64 flags = 0; + UINT64 time = 0; + INT32 x = 0; + INT32 y = 0; char buffer[128] = { 0 }; WINPR_ASSERT(ainput); @@ -237,11 +237,11 @@ static HANDLE ainput_server_get_channel_handle(ainput_server* ainput) static DWORD WINAPI ainput_server_thread_func(LPVOID arg) { - DWORD nCount; + DWORD nCount = 0; HANDLE events[2] = { 0 }; ainput_server* ainput = (ainput_server*)arg; UINT error = CHANNEL_RC_OK; - DWORD status; + DWORD status = 0; WINPR_ASSERT(ainput); @@ -437,12 +437,12 @@ void ainput_server_context_free(ainput_server_context* context) static UINT ainput_process_message(ainput_server* ainput) { - BOOL rc; + BOOL rc = 0; UINT error = ERROR_INTERNAL_ERROR; - ULONG BytesReturned; - ULONG ActualBytesReturned; - UINT16 MessageId; - wStream* s; + ULONG BytesReturned = 0; + ULONG ActualBytesReturned = 0; + UINT16 MessageId = 0; + wStream* s = NULL; WINPR_ASSERT(ainput); WINPR_ASSERT(ainput->ainput_channel); diff --git a/channels/audin/client/alsa/audin_alsa.c b/channels/audin/client/alsa/audin_alsa.c index 789fcdf0a..be3e52a94 100644 --- a/channels/audin/client/alsa/audin_alsa.c +++ b/channels/audin/client/alsa/audin_alsa.c @@ -88,10 +88,10 @@ static snd_pcm_format_t audin_alsa_format(UINT32 wFormatTag, UINT32 bitPerChanne static BOOL audin_alsa_set_params(AudinALSADevice* alsa, snd_pcm_t* capture_handle) { - int error; - SSIZE_T s; + int error = 0; + SSIZE_T s = 0; UINT32 channels = alsa->aformat.nChannels; - snd_pcm_hw_params_t* hw_params; + snd_pcm_hw_params_t* hw_params = NULL; snd_pcm_format_t format = audin_alsa_format(alsa->aformat.wFormatTag, alsa->aformat.wBitsPerSample); @@ -121,11 +121,11 @@ static BOOL audin_alsa_set_params(AudinALSADevice* alsa, snd_pcm_t* capture_hand static DWORD WINAPI audin_alsa_thread_func(LPVOID arg) { - int error; - BYTE* buffer; + int error = 0; + BYTE* buffer = NULL; snd_pcm_t* capture_handle = NULL; AudinALSADevice* alsa = (AudinALSADevice*)arg; - DWORD status; + DWORD status = 0; WLog_Print(alsa->log, WLOG_DEBUG, "in"); if ((error = snd_pcm_open(&capture_handle, alsa->device_name, SND_PCM_STREAM_CAPTURE, 0)) < 0) @@ -347,9 +347,9 @@ static UINT audin_alsa_close(IAudinDevice* device) */ static UINT audin_alsa_parse_addin_args(AudinALSADevice* device, const ADDIN_ARGV* args) { - int status; - DWORD flags; - const COMMAND_LINE_ARGUMENT_A* arg; + int status = 0; + DWORD flags = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; AudinALSADevice* alsa = (AudinALSADevice*)device; COMMAND_LINE_ARGUMENT_A audin_alsa_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "audio device name" }, @@ -393,9 +393,9 @@ static UINT audin_alsa_parse_addin_args(AudinALSADevice* device, const ADDIN_ARG FREERDP_ENTRY_POINT( UINT alsa_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)) { - const ADDIN_ARGV* args; - AudinALSADevice* alsa; - UINT error; + const ADDIN_ARGV* args = NULL; + AudinALSADevice* alsa = NULL; + UINT error = 0; alsa = (AudinALSADevice*)calloc(1, sizeof(AudinALSADevice)); if (!alsa) diff --git a/channels/audin/client/oss/audin_oss.c b/channels/audin/client/oss/audin_oss.c index e28cd82f6..979a800e9 100644 --- a/channels/audin/client/oss/audin_oss.c +++ b/channels/audin/client/oss/audin_oss.c @@ -149,13 +149,13 @@ static DWORD WINAPI audin_oss_thread_func(LPVOID arg) char dev_name[PATH_MAX] = "/dev/dsp"; char mixer_name[PATH_MAX] = "/dev/mixer"; int pcm_handle = -1; - int mixer_handle; + int mixer_handle = 0; BYTE* buffer = NULL; unsigned long tmp = 0; size_t buffer_size = 0; AudinOSSDevice* oss = (AudinOSSDevice*)arg; UINT error = 0; - DWORD status; + DWORD status = 0; if (oss == NULL) { @@ -328,7 +328,7 @@ static UINT audin_oss_open(IAudinDevice* device, AudinReceive receive, void* use */ static UINT audin_oss_close(IAudinDevice* device) { - UINT error; + UINT error = 0; AudinOSSDevice* oss = (AudinOSSDevice*)device; if (device == NULL) @@ -364,7 +364,7 @@ static UINT audin_oss_close(IAudinDevice* device) static UINT audin_oss_free(IAudinDevice* device) { AudinOSSDevice* oss = (AudinOSSDevice*)device; - UINT error; + UINT error = 0; if (device == NULL) return ERROR_INVALID_PARAMETER; @@ -385,11 +385,11 @@ static UINT audin_oss_free(IAudinDevice* device) */ static UINT audin_oss_parse_addin_args(AudinOSSDevice* device, const ADDIN_ARGV* args) { - int status; - char* str_num; - char* eptr; - DWORD flags; - const COMMAND_LINE_ARGUMENT_A* arg; + int status = 0; + char* str_num = NULL; + char* eptr = NULL; + DWORD flags = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; AudinOSSDevice* oss = (AudinOSSDevice*)device; COMMAND_LINE_ARGUMENT_A audin_oss_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "audio device name" }, @@ -452,9 +452,9 @@ static UINT audin_oss_parse_addin_args(AudinOSSDevice* device, const ADDIN_ARGV* FREERDP_ENTRY_POINT( UINT oss_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)) { - const ADDIN_ARGV* args; - AudinOSSDevice* oss; - UINT error; + const ADDIN_ARGV* args = NULL; + AudinOSSDevice* oss = NULL; + UINT error = 0; oss = (AudinOSSDevice*)calloc(1, sizeof(AudinOSSDevice)); if (!oss) diff --git a/channels/audin/client/pulse/audin_pulse.c b/channels/audin/client/pulse/audin_pulse.c index 9cc150472..0e330ad91 100644 --- a/channels/audin/client/pulse/audin_pulse.c +++ b/channels/audin/client/pulse/audin_pulse.c @@ -105,9 +105,8 @@ static const char* pulse_stream_state_string(pa_stream_state_t state) static void audin_pulse_context_state_callback(pa_context* context, void* userdata) { - pa_context_state_t state; AudinPulseDevice* pulse = (AudinPulseDevice*)userdata; - state = pa_context_get_state(context); + pa_context_state_t state = pa_context_get_state(context); WLog_Print(pulse->log, WLOG_DEBUG, "context state %s", pulse_context_state_string(state)); switch (state) @@ -133,7 +132,7 @@ static void audin_pulse_context_state_callback(pa_context* context, void* userda */ static UINT audin_pulse_connect(IAudinDevice* device) { - pa_context_state_t state; + pa_context_state_t state = PA_CONTEXT_FAILED; AudinPulseDevice* pulse = (AudinPulseDevice*)device; if (!pulse->context) @@ -303,9 +302,8 @@ static UINT audin_pulse_set_format(IAudinDevice* device, const AUDIO_FORMAT* for static void audin_pulse_stream_state_callback(pa_stream* stream, void* userdata) { - pa_stream_state_t state; AudinPulseDevice* pulse = (AudinPulseDevice*)userdata; - state = pa_stream_get_state(stream); + pa_stream_state_t state = pa_stream_get_state(stream); WLog_Print(pulse->log, WLOG_DEBUG, "stream state %s", pulse_stream_state_string(state)); switch (state) @@ -328,7 +326,7 @@ static void audin_pulse_stream_state_callback(pa_stream* stream, void* userdata) static void audin_pulse_stream_request_callback(pa_stream* stream, size_t length, void* userdata) { - const void* data; + const void* data = NULL; AudinPulseDevice* pulse = (AudinPulseDevice*)userdata; UINT error = CHANNEL_RC_OK; pa_stream_peek(stream, &data, &length); @@ -373,7 +371,7 @@ static UINT audin_pulse_close(IAudinDevice* device) */ static UINT audin_pulse_open(IAudinDevice* device, AudinReceive receive, void* user_data) { - pa_stream_state_t state; + pa_stream_state_t state = PA_STREAM_FAILED; pa_buffer_attr buffer_attr = { 0 }; AudinPulseDevice* pulse = (AudinPulseDevice*)device; @@ -454,9 +452,9 @@ static UINT audin_pulse_open(IAudinDevice* device, AudinReceive receive, void* u */ static UINT audin_pulse_parse_addin_args(AudinPulseDevice* device, const ADDIN_ARGV* args) { - int status; - DWORD flags; - const COMMAND_LINE_ARGUMENT_A* arg; + int status = 0; + DWORD flags = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; AudinPulseDevice* pulse = (AudinPulseDevice*)device; COMMAND_LINE_ARGUMENT_A audin_pulse_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "audio device name" }, @@ -501,9 +499,9 @@ static UINT audin_pulse_parse_addin_args(AudinPulseDevice* device, const ADDIN_A FREERDP_ENTRY_POINT(UINT pulse_freerdp_audin_client_subsystem_entry( PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)) { - const ADDIN_ARGV* args; - AudinPulseDevice* pulse; - UINT error; + const ADDIN_ARGV* args = NULL; + AudinPulseDevice* pulse = NULL; + UINT error = 0; pulse = (AudinPulseDevice*)calloc(1, sizeof(AudinPulseDevice)); if (!pulse) diff --git a/channels/audin/server/audin.c b/channels/audin/server/audin.c index 05c761c78..ef60919b7 100644 --- a/channels/audin/server/audin.c +++ b/channels/audin/server/audin.c @@ -451,7 +451,7 @@ static BOOL audin_server_open(audin_server_context* context) PULONG pSessionId = NULL; DWORD BytesReturned = 0; audin->SessionId = WTS_CURRENT_SESSION; - UINT32 channelId; + UINT32 channelId = 0; BOOL status = TRUE; if (WTSQuerySessionInformationA(context->vcm, WTS_CURRENT_SESSION, WTSSessionId, @@ -563,7 +563,7 @@ static UINT audin_server_packet_send(audin_server_context* context, wStream* s) { audin_server* audin = (audin_server*)context; UINT error = CHANNEL_RC_OK; - ULONG written; + ULONG written = 0; WINPR_ASSERT(context); WINPR_ASSERT(s); diff --git a/channels/client/addin.c b/channels/client/addin.c index c188fa2a6..c3a6aab42 100644 --- a/channels/client/addin.c +++ b/channels/client/addin.c @@ -87,11 +87,11 @@ static FREERDP_ADDIN** freerdp_channels_list_client_static_addins(LPCSTR pszName LPCSTR pszSubsystem, LPCSTR pszType, DWORD dwFlags) { - size_t i; - size_t j; - DWORD nAddins; + size_t i = 0; + size_t j = 0; + DWORD nAddins = 0; FREERDP_ADDIN** ppAddins = NULL; - const STATIC_SUBSYSTEM_ENTRY* subsystems; + const STATIC_SUBSYSTEM_ENTRY* subsystems = NULL; nAddins = 0; ppAddins = (FREERDP_ADDIN**)calloc(128, sizeof(FREERDP_ADDIN*)); @@ -165,20 +165,20 @@ static HANDLE FindFirstFileUTF8(LPCSTR pszSearchPath, WIN32_FIND_DATAW* FindData static FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPCSTR pszName, LPCSTR pszSubsystem, LPCSTR pszType, DWORD dwFlags) { - int index; - int nDashes; - HANDLE hFind; - DWORD nAddins; - LPSTR pszPattern; - size_t cchPattern; + int index = 0; + int nDashes = 0; + HANDLE hFind = NULL; + DWORD nAddins = 0; + LPSTR pszPattern = NULL; + size_t cchPattern = 0; LPCSTR pszAddinPath = FREERDP_ADDIN_PATH; LPCSTR pszInstallPrefix = FREERDP_INSTALL_PREFIX; - LPCSTR pszExtension; - LPSTR pszSearchPath; - size_t cchSearchPath; - size_t cchAddinPath; - size_t cchInstallPrefix; - FREERDP_ADDIN** ppAddins; + LPCSTR pszExtension = NULL; + LPSTR pszSearchPath = NULL; + size_t cchSearchPath = 0; + size_t cchAddinPath = 0; + size_t cchInstallPrefix = 0; + FREERDP_ADDIN** ppAddins = NULL; WIN32_FIND_DATAW FindData = { 0 }; cchAddinPath = strnlen(pszAddinPath, sizeof(FREERDP_ADDIN_PATH)); cchInstallPrefix = strnlen(pszInstallPrefix, sizeof(FREERDP_INSTALL_PREFIX)); @@ -275,7 +275,7 @@ static FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPCSTR pszName, LPCS if (nDashes == 1) { - size_t len; + size_t len = 0; char* p[2] = { 0 }; /* -client. */ p[0] = cFileName; @@ -301,7 +301,7 @@ static FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPCSTR pszName, LPCS } else if (nDashes == 2) { - size_t len; + size_t len = 0; char* p[4] = { 0 }; /* -client-. */ p[0] = cFileName; @@ -344,7 +344,7 @@ static FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPCSTR pszName, LPCS } else if (nDashes == 3) { - size_t len; + size_t len = 0; char* p[5] = { 0 }; /* -client--. */ p[0] = cFileName; @@ -428,7 +428,7 @@ FREERDP_ADDIN** freerdp_channels_list_addins(LPCSTR pszName, LPCSTR pszSubsystem void freerdp_channels_addin_list_free(FREERDP_ADDIN** ppAddins) { - size_t index; + size_t index = 0; if (!ppAddins) return; @@ -443,7 +443,7 @@ extern const STATIC_ENTRY CLIENT_VirtualChannelEntryEx_TABLE[]; static BOOL freerdp_channels_is_virtual_channel_entry_ex(LPCSTR pszName) { - size_t i; + size_t i = 0; for (i = 0; CLIENT_VirtualChannelEntryEx_TABLE[i].name != NULL; i++) { @@ -639,7 +639,7 @@ UINT channel_client_post_message(void* MsgsHandle, LPVOID pData, UINT32 dataLeng UINT32 totalLength, UINT32 dataFlags) { msg_proc_internals* internals = MsgsHandle; - wStream* data_in; + wStream* data_in = NULL; if (!internals) { @@ -714,7 +714,7 @@ UINT channel_client_post_message(void* MsgsHandle, LPVOID pData, UINT32 dataLeng UINT channel_client_quit_handler(void* MsgsHandle) { msg_proc_internals* internals = MsgsHandle; - UINT rc; + UINT rc = 0; if (!internals) { /* TODO: return some error here */ diff --git a/channels/client/generic_dynvc.c b/channels/client/generic_dynvc.c index 0503c168d..263b5cecc 100644 --- a/channels/client/generic_dynvc.c +++ b/channels/client/generic_dynvc.c @@ -28,8 +28,8 @@ static UINT generic_on_new_channel_connection(IWTSListenerCallback* pListenerCal BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - GENERIC_CHANNEL_CALLBACK* callback; - GENERIC_DYNVC_PLUGIN* plugin; + GENERIC_CHANNEL_CALLBACK* callback = NULL; + GENERIC_DYNVC_PLUGIN* plugin = NULL; GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; if (!listener_callback || !listener_callback->plugin) @@ -60,8 +60,8 @@ static UINT generic_on_new_channel_connection(IWTSListenerCallback* pListenerCal static UINT generic_dynvc_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelManager* pChannelMgr) { - UINT rc; - GENERIC_LISTENER_CALLBACK* listener_callback; + UINT rc = 0; + GENERIC_LISTENER_CALLBACK* listener_callback = NULL; GENERIC_DYNVC_PLUGIN* plugin = (GENERIC_DYNVC_PLUGIN*)pPlugin; if (!plugin) @@ -155,7 +155,7 @@ UINT freerdp_generic_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints, const c DYNVC_PLUGIN_INIT_FN initPluginFn, DYNVC_PLUGIN_TERMINATE_FN terminatePluginFn) { - GENERIC_DYNVC_PLUGIN* plugin; + GENERIC_DYNVC_PLUGIN* plugin = NULL; UINT error = CHANNEL_RC_INITIALIZATION_ERROR; WINPR_ASSERT(pEntryPoints); diff --git a/channels/cliprdr/client/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c index 13ca0c575..c613b6312 100644 --- a/channels/cliprdr/client/cliprdr_main.c +++ b/channels/cliprdr/client/cliprdr_main.c @@ -74,7 +74,7 @@ static const char* CB_MSG_TYPE_STRINGS(UINT32 type) CliprdrClientContext* cliprdr_get_client_interface(cliprdrPlugin* cliprdr) { - CliprdrClientContext* pInterface; + CliprdrClientContext* pInterface = NULL; if (!cliprdr) return NULL; @@ -90,8 +90,8 @@ CliprdrClientContext* cliprdr_get_client_interface(cliprdrPlugin* cliprdr) */ static UINT cliprdr_packet_send(cliprdrPlugin* cliprdr, wStream* s) { - size_t pos; - UINT32 dataLen; + size_t pos = 0; + UINT32 dataLen = 0; UINT status = CHANNEL_RC_OK; WINPR_ASSERT(cliprdr); @@ -168,8 +168,8 @@ static void cliprdr_print_general_capability_flags(UINT32 flags) */ static UINT cliprdr_process_general_capability(cliprdrPlugin* cliprdr, wStream* s) { - UINT32 version; - UINT32 generalFlags; + UINT32 version = 0; + UINT32 generalFlags = 0; CLIPRDR_CAPABILITIES capabilities = { 0 }; CLIPRDR_GENERAL_CAPABILITY_SET generalCapabilitySet = { 0 }; CliprdrClientContext* context = cliprdr_get_client_interface(cliprdr); @@ -223,10 +223,10 @@ static UINT cliprdr_process_general_capability(cliprdrPlugin* cliprdr, wStream* static UINT cliprdr_process_clip_caps(cliprdrPlugin* cliprdr, wStream* s, UINT32 length, UINT16 flags) { - UINT16 index; - UINT16 lengthCapability; - UINT16 cCapabilitiesSets; - UINT16 capabilitySetType; + UINT16 index = 0; + UINT16 lengthCapability = 0; + UINT16 cCapabilitiesSets = 0; + UINT16 capabilitySetType = 0; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(cliprdr); @@ -458,10 +458,10 @@ static UINT cliprdr_process_unlock_clipdata(cliprdrPlugin* cliprdr, wStream* s, static UINT cliprdr_order_recv(LPVOID userdata, wStream* s) { cliprdrPlugin* cliprdr = userdata; - UINT16 msgType; - UINT16 msgFlags; - UINT32 dataLen; - UINT error; + UINT16 msgType = 0; + UINT16 msgFlags = 0; + UINT32 dataLen = 0; + UINT error = 0; WINPR_ASSERT(cliprdr); WINPR_ASSERT(s); @@ -572,10 +572,10 @@ static UINT cliprdr_order_recv(LPVOID userdata, wStream* s) static UINT cliprdr_client_capabilities(CliprdrClientContext* context, const CLIPRDR_CAPABILITIES* capabilities) { - wStream* s; - UINT32 flags; - const CLIPRDR_GENERAL_CAPABILITY_SET* generalCapabilitySet; - cliprdrPlugin* cliprdr; + wStream* s = NULL; + UINT32 flags = 0; + const CLIPRDR_GENERAL_CAPABILITY_SET* generalCapabilitySet = NULL; + cliprdrPlugin* cliprdr = NULL; WINPR_ASSERT(context); @@ -635,8 +635,8 @@ static UINT cliprdr_client_capabilities(CliprdrClientContext* context, static UINT cliprdr_temp_directory(CliprdrClientContext* context, const CLIPRDR_TEMP_DIRECTORY* tempDirectory) { - wStream* s; - cliprdrPlugin* cliprdr; + wStream* s = NULL; + cliprdrPlugin* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(tempDirectory); @@ -672,8 +672,8 @@ static UINT cliprdr_temp_directory(CliprdrClientContext* context, static UINT cliprdr_client_format_list(CliprdrClientContext* context, const CLIPRDR_FORMAT_LIST* formatList) { - wStream* s; - cliprdrPlugin* cliprdr; + wStream* s = NULL; + cliprdrPlugin* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(formatList); @@ -717,8 +717,8 @@ static UINT cliprdr_client_format_list_response(CliprdrClientContext* context, const CLIPRDR_FORMAT_LIST_RESPONSE* formatListResponse) { - wStream* s; - cliprdrPlugin* cliprdr; + wStream* s = NULL; + cliprdrPlugin* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(formatListResponse); @@ -746,8 +746,8 @@ cliprdr_client_format_list_response(CliprdrClientContext* context, static UINT cliprdr_client_lock_clipboard_data(CliprdrClientContext* context, const CLIPRDR_LOCK_CLIPBOARD_DATA* lockClipboardData) { - wStream* s; - cliprdrPlugin* cliprdr; + wStream* s = NULL; + cliprdrPlugin* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(lockClipboardData); @@ -777,8 +777,8 @@ static UINT cliprdr_client_unlock_clipboard_data(CliprdrClientContext* context, const CLIPRDR_UNLOCK_CLIPBOARD_DATA* unlockClipboardData) { - wStream* s; - cliprdrPlugin* cliprdr; + wStream* s = NULL; + cliprdrPlugin* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(unlockClipboardData); @@ -807,8 +807,8 @@ cliprdr_client_unlock_clipboard_data(CliprdrClientContext* context, static UINT cliprdr_client_format_data_request(CliprdrClientContext* context, const CLIPRDR_FORMAT_DATA_REQUEST* formatDataRequest) { - wStream* s; - cliprdrPlugin* cliprdr; + wStream* s = NULL; + cliprdrPlugin* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(formatDataRequest); @@ -845,8 +845,8 @@ static UINT cliprdr_client_format_data_response(CliprdrClientContext* context, const CLIPRDR_FORMAT_DATA_RESPONSE* formatDataResponse) { - wStream* s; - cliprdrPlugin* cliprdr; + wStream* s = NULL; + cliprdrPlugin* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(formatDataResponse); @@ -881,8 +881,8 @@ static UINT cliprdr_client_file_contents_request(CliprdrClientContext* context, const CLIPRDR_FILE_CONTENTS_REQUEST* fileContentsRequest) { - wStream* s; - cliprdrPlugin* cliprdr; + wStream* s = NULL; + cliprdrPlugin* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(fileContentsRequest); @@ -930,8 +930,8 @@ static UINT cliprdr_client_file_contents_response(CliprdrClientContext* context, const CLIPRDR_FILE_CONTENTS_RESPONSE* fileContentsResponse) { - wStream* s; - cliprdrPlugin* cliprdr; + wStream* s = NULL; + cliprdrPlugin* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(fileContentsResponse); @@ -1004,7 +1004,7 @@ static VOID VCAPITYPE cliprdr_virtual_channel_open_event_ex(LPVOID lpUserParam, static UINT cliprdr_virtual_channel_event_connected(cliprdrPlugin* cliprdr, LPVOID pData, UINT32 dataLength) { - DWORD status; + DWORD status = 0; WINPR_ASSERT(cliprdr); WINPR_ASSERT(cliprdr->context); @@ -1030,7 +1030,7 @@ static UINT cliprdr_virtual_channel_event_connected(cliprdrPlugin* cliprdr, LPVO */ static UINT cliprdr_virtual_channel_event_disconnected(cliprdrPlugin* cliprdr) { - UINT rc; + UINT rc = 0; WINPR_ASSERT(cliprdr); @@ -1123,10 +1123,10 @@ static VOID VCAPITYPE cliprdr_virtual_channel_init_event_ex(LPVOID lpUserParam, FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, PVOID pInitHandle)) { - UINT rc; - cliprdrPlugin* cliprdr; + UINT rc = 0; + cliprdrPlugin* cliprdr = NULL; CliprdrClientContext* context = NULL; - CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx; + CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = NULL; cliprdr = (cliprdrPlugin*)calloc(1, sizeof(cliprdrPlugin)); if (!cliprdr) diff --git a/channels/cliprdr/cliprdr_common.c b/channels/cliprdr/cliprdr_common.c index 6bf25fe11..9a98cb6e0 100644 --- a/channels/cliprdr/cliprdr_common.c +++ b/channels/cliprdr/cliprdr_common.c @@ -60,7 +60,7 @@ static BOOL cliprdr_validate_file_contents_request(const CLIPRDR_FILE_CONTENTS_R wStream* cliprdr_packet_new(UINT16 msgType, UINT16 msgFlags, UINT32 dataLen) { - wStream* s; + wStream* s = NULL; s = Stream_New(NULL, dataLen + 8); if (!s) @@ -116,7 +116,7 @@ static void cliprdr_write_file_contents_response(wStream* s, wStream* cliprdr_packet_lock_clipdata_new(const CLIPRDR_LOCK_CLIPBOARD_DATA* lockClipboardData) { - wStream* s; + wStream* s = NULL; if (!lockClipboardData) return NULL; @@ -133,7 +133,7 @@ wStream* cliprdr_packet_lock_clipdata_new(const CLIPRDR_LOCK_CLIPBOARD_DATA* loc wStream* cliprdr_packet_unlock_clipdata_new(const CLIPRDR_UNLOCK_CLIPBOARD_DATA* unlockClipboardData) { - wStream* s; + wStream* s = NULL; if (!unlockClipboardData) return NULL; @@ -149,7 +149,7 @@ cliprdr_packet_unlock_clipdata_new(const CLIPRDR_UNLOCK_CLIPBOARD_DATA* unlockCl wStream* cliprdr_packet_file_contents_request_new(const CLIPRDR_FILE_CONTENTS_REQUEST* request) { - wStream* s; + wStream* s = NULL; if (!request) return NULL; @@ -165,7 +165,7 @@ wStream* cliprdr_packet_file_contents_request_new(const CLIPRDR_FILE_CONTENTS_RE wStream* cliprdr_packet_file_contents_response_new(const CLIPRDR_FILE_CONTENTS_RESPONSE* response) { - wStream* s; + wStream* s = NULL; if (!response) return NULL; @@ -183,14 +183,14 @@ wStream* cliprdr_packet_file_contents_response_new(const CLIPRDR_FILE_CONTENTS_R wStream* cliprdr_packet_format_list_new(const CLIPRDR_FORMAT_LIST* formatList, BOOL useLongFormatNames) { - wStream* s; - UINT32 index; + wStream* s = NULL; + UINT32 index = 0; size_t formatNameSize = 0; - char* szFormatName; - WCHAR* wszFormatName; + char* szFormatName = NULL; + WCHAR* wszFormatName = NULL; BOOL asciiNames = FALSE; - CLIPRDR_FORMAT* format; - UINT32 length; + CLIPRDR_FORMAT* format = NULL; + UINT32 length = 0; if (formatList->common.msgType != CB_FORMAT_LIST) WLog_WARN(TAG, "called with invalid type %08" PRIx32, formatList->common.msgType); @@ -388,8 +388,8 @@ UINT cliprdr_read_file_contents_response(wStream* s, CLIPRDR_FILE_CONTENTS_RESPO UINT cliprdr_read_format_list(wStream* s, CLIPRDR_FORMAT_LIST* formatList, BOOL useLongFormatNames) { - UINT32 index; - int formatNameLength; + UINT32 index = 0; + int formatNameLength = 0; const char* szFormatName = NULL; const WCHAR* wszFormatName = NULL; wStream sub1buffer = { 0 }; @@ -489,7 +489,7 @@ UINT cliprdr_read_format_list(wStream* s, CLIPRDR_FORMAT_LIST* formatList, BOOL while (Stream_GetRemainingLength(sub1) > 0) { - size_t rest; + size_t rest = 0; if (!Stream_SafeSeek(sub1, 4)) /* formatId (4 bytes) */ goto error_out; @@ -515,7 +515,7 @@ UINT cliprdr_read_format_list(wStream* s, CLIPRDR_FORMAT_LIST* formatList, BOOL while (Stream_GetRemainingLength(sub2) >= 4) { - size_t rest; + size_t rest = 0; CLIPRDR_FORMAT* format = &formats[index]; Stream_Read_UINT32(sub2, format->formatId); /* formatId (4 bytes) */ diff --git a/channels/cliprdr/server/cliprdr_main.c b/channels/cliprdr/server/cliprdr_main.c index 73279ac97..6fee15470 100644 --- a/channels/cliprdr/server/cliprdr_main.c +++ b/channels/cliprdr/server/cliprdr_main.c @@ -78,11 +78,11 @@ */ static UINT cliprdr_server_packet_send(CliprdrServerPrivate* cliprdr, wStream* s) { - UINT rc; - size_t pos; - BOOL status; - UINT32 dataLen; - ULONG written; + UINT rc = 0; + size_t pos = 0; + BOOL status = 0; + UINT32 dataLen = 0; + ULONG written = 0; WINPR_ASSERT(cliprdr); @@ -119,9 +119,9 @@ static UINT cliprdr_server_capabilities(CliprdrServerContext* context, const CLIPRDR_CAPABILITIES* capabilities) { size_t offset = 0; - UINT32 x; - wStream* s; - CliprdrServerPrivate* cliprdr; + UINT32 x = 0; + wStream* s = NULL; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(capabilities); @@ -192,8 +192,8 @@ static UINT cliprdr_server_capabilities(CliprdrServerContext* context, static UINT cliprdr_server_monitor_ready(CliprdrServerContext* context, const CLIPRDR_MONITOR_READY* monitorReady) { - wStream* s; - CliprdrServerPrivate* cliprdr; + wStream* s = NULL; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(monitorReady); @@ -224,8 +224,8 @@ static UINT cliprdr_server_monitor_ready(CliprdrServerContext* context, static UINT cliprdr_server_format_list(CliprdrServerContext* context, const CLIPRDR_FORMAT_LIST* formatList) { - wStream* s; - CliprdrServerPrivate* cliprdr; + wStream* s = NULL; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(formatList); @@ -252,8 +252,8 @@ static UINT cliprdr_server_format_list_response(CliprdrServerContext* context, const CLIPRDR_FORMAT_LIST_RESPONSE* formatListResponse) { - wStream* s; - CliprdrServerPrivate* cliprdr; + wStream* s = NULL; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(formatListResponse); @@ -283,8 +283,8 @@ cliprdr_server_format_list_response(CliprdrServerContext* context, static UINT cliprdr_server_lock_clipboard_data(CliprdrServerContext* context, const CLIPRDR_LOCK_CLIPBOARD_DATA* lockClipboardData) { - wStream* s; - CliprdrServerPrivate* cliprdr; + wStream* s = NULL; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(lockClipboardData); @@ -314,8 +314,8 @@ static UINT cliprdr_server_unlock_clipboard_data(CliprdrServerContext* context, const CLIPRDR_UNLOCK_CLIPBOARD_DATA* unlockClipboardData) { - wStream* s; - CliprdrServerPrivate* cliprdr; + wStream* s = NULL; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(unlockClipboardData); @@ -345,8 +345,8 @@ cliprdr_server_unlock_clipboard_data(CliprdrServerContext* context, static UINT cliprdr_server_format_data_request(CliprdrServerContext* context, const CLIPRDR_FORMAT_DATA_REQUEST* formatDataRequest) { - wStream* s; - CliprdrServerPrivate* cliprdr; + wStream* s = NULL; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(formatDataRequest); @@ -378,8 +378,8 @@ static UINT cliprdr_server_format_data_response(CliprdrServerContext* context, const CLIPRDR_FORMAT_DATA_RESPONSE* formatDataResponse) { - wStream* s; - CliprdrServerPrivate* cliprdr; + wStream* s = NULL; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(formatDataResponse); @@ -412,8 +412,8 @@ static UINT cliprdr_server_file_contents_request(CliprdrServerContext* context, const CLIPRDR_FILE_CONTENTS_REQUEST* fileContentsRequest) { - wStream* s; - CliprdrServerPrivate* cliprdr; + wStream* s = NULL; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(fileContentsRequest); @@ -444,8 +444,8 @@ static UINT cliprdr_server_file_contents_response(CliprdrServerContext* context, const CLIPRDR_FILE_CONTENTS_RESPONSE* fileContentsResponse) { - wStream* s; - CliprdrServerPrivate* cliprdr; + wStream* s = NULL; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); WINPR_ASSERT(fileContentsResponse); @@ -514,12 +514,12 @@ static UINT cliprdr_server_receive_general_capability(CliprdrServerContext* cont static UINT cliprdr_server_receive_capabilities(CliprdrServerContext* context, wStream* s, const CLIPRDR_HEADER* header) { - UINT16 capabilitySetType; - UINT16 capabilitySetLength; + UINT16 capabilitySetType = 0; + UINT16 capabilitySetLength = 0; UINT error = ERROR_INVALID_DATA; size_t cap_sets_size = 0; CLIPRDR_CAPABILITIES capabilities = { 0 }; - CLIPRDR_CAPABILITY_SET* capSet; + CLIPRDR_CAPABILITY_SET* capSet = NULL; WINPR_ASSERT(context); WINPR_UNUSED(header); @@ -594,9 +594,9 @@ out: static UINT cliprdr_server_receive_temporary_directory(CliprdrServerContext* context, wStream* s, const CLIPRDR_HEADER* header) { - size_t length; + size_t length = 0; CLIPRDR_TEMP_DIRECTORY tempDirectory = { 0 }; - CliprdrServerPrivate* cliprdr; + CliprdrServerPrivate* cliprdr = NULL; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(context); @@ -899,7 +899,7 @@ static UINT cliprdr_server_receive_filecontents_response(CliprdrServerContext* c static UINT cliprdr_server_receive_pdu(CliprdrServerContext* context, wStream* s, const CLIPRDR_HEADER* header) { - UINT error; + UINT error = 0; WINPR_ASSERT(context); WINPR_ASSERT(header); @@ -1068,14 +1068,14 @@ static UINT cliprdr_server_init(CliprdrServerContext* context) */ static UINT cliprdr_server_read(CliprdrServerContext* context) { - wStream* s; - size_t position; - DWORD BytesToRead; - DWORD BytesReturned; + wStream* s = NULL; + size_t position = 0; + DWORD BytesToRead = 0; + DWORD BytesReturned = 0; CLIPRDR_HEADER header = { 0 }; - CliprdrServerPrivate* cliprdr; - UINT error; - DWORD status; + CliprdrServerPrivate* cliprdr = NULL; + UINT error = 0; + DWORD status = 0; WINPR_ASSERT(context); @@ -1216,9 +1216,9 @@ static DWORD WINAPI cliprdr_server_thread(LPVOID arg) DWORD status = 0; DWORD nCount = 0; HANDLE events[MAXIMUM_WAIT_OBJECTS] = { 0 }; - HANDLE ChannelEvent; + HANDLE ChannelEvent = NULL; CliprdrServerContext* context = (CliprdrServerContext*)arg; - CliprdrServerPrivate* cliprdr; + CliprdrServerPrivate* cliprdr = NULL; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(context); @@ -1300,7 +1300,7 @@ static UINT cliprdr_server_open(CliprdrServerContext* context) { void* buffer = NULL; DWORD BytesReturned = 0; - CliprdrServerPrivate* cliprdr; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); @@ -1347,7 +1347,7 @@ static UINT cliprdr_server_open(CliprdrServerContext* context) */ static UINT cliprdr_server_close(CliprdrServerContext* context) { - CliprdrServerPrivate* cliprdr; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); @@ -1370,8 +1370,8 @@ static UINT cliprdr_server_close(CliprdrServerContext* context) */ static UINT cliprdr_server_start(CliprdrServerContext* context) { - UINT error; - CliprdrServerPrivate* cliprdr; + UINT error = 0; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); @@ -1412,7 +1412,7 @@ static UINT cliprdr_server_start(CliprdrServerContext* context) static UINT cliprdr_server_stop(CliprdrServerContext* context) { UINT error = CHANNEL_RC_OK; - CliprdrServerPrivate* cliprdr; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); @@ -1442,7 +1442,7 @@ static UINT cliprdr_server_stop(CliprdrServerContext* context) static HANDLE cliprdr_server_get_event_handle(CliprdrServerContext* context) { - CliprdrServerPrivate* cliprdr; + CliprdrServerPrivate* cliprdr = NULL; WINPR_ASSERT(context); @@ -1463,7 +1463,7 @@ static UINT cliprdr_server_check_event_handle(CliprdrServerContext* context) CliprdrServerContext* cliprdr_server_context_new(HANDLE vcm) { - CliprdrServerPrivate* cliprdr; + CliprdrServerPrivate* cliprdr = NULL; CliprdrServerContext* context = (CliprdrServerContext*)calloc(1, sizeof(CliprdrServerContext)); if (context) @@ -1513,7 +1513,7 @@ CliprdrServerContext* cliprdr_server_context_new(HANDLE vcm) void cliprdr_server_context_free(CliprdrServerContext* context) { - CliprdrServerPrivate* cliprdr; + CliprdrServerPrivate* cliprdr = NULL; if (!context) return; diff --git a/channels/disp/client/disp_main.c b/channels/disp/client/disp_main.c index e757e6a5d..b06ebf9e8 100644 --- a/channels/disp/client/disp_main.c +++ b/channels/disp/client/disp_main.c @@ -61,11 +61,11 @@ static UINT disp_send_display_control_monitor_layout_pdu(GENERIC_CHANNEL_CALLBACK* callback, UINT32 NumMonitors, const DISPLAY_CONTROL_MONITOR_LAYOUT* Monitors) { - UINT status; - wStream* s; - UINT32 index; - DISP_PLUGIN* disp; - UINT32 MonitorLayoutSize; + UINT status = 0; + wStream* s = NULL; + UINT32 index = 0; + DISP_PLUGIN* disp = NULL; + UINT32 MonitorLayoutSize = 0; DISPLAY_CONTROL_HEADER header = { 0 }; WINPR_ASSERT(callback); @@ -154,8 +154,8 @@ out: */ static UINT disp_recv_display_control_caps_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - DISP_PLUGIN* disp; - DispClientContext* context; + DISP_PLUGIN* disp = NULL; + DispClientContext* context = NULL; UINT ret = CHANNEL_RC_OK; WINPR_ASSERT(callback); @@ -188,7 +188,7 @@ static UINT disp_recv_display_control_caps_pdu(GENERIC_CHANNEL_CALLBACK* callbac */ static UINT disp_recv_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - UINT32 error; + UINT32 error = 0; DISPLAY_CONTROL_HEADER header = { 0 }; WINPR_ASSERT(callback); @@ -254,8 +254,8 @@ static UINT disp_on_close(IWTSVirtualChannelCallback* pChannelCallback) static UINT disp_send_monitor_layout(DispClientContext* context, UINT32 NumMonitors, DISPLAY_CONTROL_MONITOR_LAYOUT* Monitors) { - DISP_PLUGIN* disp; - GENERIC_CHANNEL_CALLBACK* callback; + DISP_PLUGIN* disp = NULL; + GENERIC_CHANNEL_CALLBACK* callback = NULL; WINPR_ASSERT(context); @@ -275,7 +275,7 @@ static UINT disp_send_monitor_layout(DispClientContext* context, UINT32 NumMonit static UINT disp_plugin_initialize(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, rdpSettings* settings) { - DispClientContext* context; + DispClientContext* context = NULL; DISP_PLUGIN* disp = (DISP_PLUGIN*)base; WINPR_ASSERT(disp); diff --git a/channels/disp/server/disp_main.c b/channels/disp/server/disp_main.c index e5ecdb758..43e0c1af2 100644 --- a/channels/disp/server/disp_main.c +++ b/channels/disp/server/disp_main.c @@ -46,7 +46,7 @@ static wStream* disp_server_single_packet_new(UINT32 type, UINT32 length) { - UINT error; + UINT error = 0; DISPLAY_CONTROL_HEADER header; wStream* s = Stream_New(NULL, DISPLAY_CONTROL_HEADER_LENGTH + length); @@ -127,7 +127,7 @@ static BOOL disp_server_is_monitor_layout_valid(const DISPLAY_CONTROL_MONITOR_LA static UINT disp_recv_display_control_monitor_layout_pdu(wStream* s, DispServerContext* context) { UINT32 error = CHANNEL_RC_OK; - UINT32 index; + UINT32 index = 0; DISPLAY_CONTROL_MONITOR_LAYOUT_PDU pdu = { 0 }; WINPR_ASSERT(s); @@ -214,8 +214,8 @@ out: static UINT disp_server_receive_pdu(DispServerContext* context, wStream* s) { UINT error = CHANNEL_RC_OK; - size_t beg; - size_t end; + size_t beg = 0; + size_t end = 0; DISPLAY_CONTROL_HEADER header = { 0 }; WINPR_ASSERT(s); @@ -260,11 +260,11 @@ static UINT disp_server_receive_pdu(DispServerContext* context, wStream* s) static UINT disp_server_handle_messages(DispServerContext* context) { - DWORD BytesReturned; - void* buffer; + DWORD BytesReturned = 0; + void* buffer = NULL; UINT ret = CHANNEL_RC_OK; - DispServerPrivate* priv; - wStream* s; + DispServerPrivate* priv = NULL; + wStream* s = NULL; WINPR_ASSERT(context); @@ -340,8 +340,8 @@ static UINT disp_server_handle_messages(DispServerContext* context) static DWORD WINAPI disp_server_thread_func(LPVOID arg) { DispServerContext* context = (DispServerContext*)arg; - DispServerPrivate* priv; - DWORD status; + DispServerPrivate* priv = NULL; + DWORD status = 0; DWORD nCount = 0; HANDLE events[8] = { 0 }; UINT error = CHANNEL_RC_OK; @@ -389,11 +389,11 @@ static DWORD WINAPI disp_server_thread_func(LPVOID arg) static UINT disp_server_open(DispServerContext* context) { UINT rc = ERROR_INTERNAL_ERROR; - DispServerPrivate* priv; + DispServerPrivate* priv = NULL; DWORD BytesReturned = 0; PULONG pSessionId = NULL; void* buffer = NULL; - UINT32 channelId; + UINT32 channelId = 0; BOOL status = TRUE; WINPR_ASSERT(context); @@ -483,8 +483,8 @@ out_close: static UINT disp_server_packet_send(DispServerContext* context, wStream* s) { - UINT ret; - ULONG written; + UINT ret = 0; + ULONG written = 0; WINPR_ASSERT(context); WINPR_ASSERT(s); @@ -516,7 +516,7 @@ out: */ static UINT disp_server_send_caps_pdu(DispServerContext* context) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); @@ -542,7 +542,7 @@ static UINT disp_server_send_caps_pdu(DispServerContext* context) static UINT disp_server_close(DispServerContext* context) { UINT error = CHANNEL_RC_OK; - DispServerPrivate* priv; + DispServerPrivate* priv = NULL; WINPR_ASSERT(context); @@ -577,8 +577,8 @@ static UINT disp_server_close(DispServerContext* context) DispServerContext* disp_server_context_new(HANDLE vcm) { - DispServerContext* context; - DispServerPrivate* priv; + DispServerContext* context = NULL; + DispServerPrivate* priv = NULL; context = (DispServerContext*)calloc(1, sizeof(DispServerContext)); if (!context) diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c index 4a1c15a45..8887cfb04 100644 --- a/channels/drdynvc/client/drdynvc_main.c +++ b/channels/drdynvc/client/drdynvc_main.c @@ -71,7 +71,7 @@ static UINT dvcman_create_listener(IWTSVirtualChannelManager* pChannelMgr, IWTSListener** ppListener) { DVCMAN* dvcman = (DVCMAN*)pChannelMgr; - DVCMAN_LISTENER* listener; + DVCMAN_LISTENER* listener = NULL; WINPR_ASSERT(dvcman); WLog_DBG(TAG, "create_listener: %" PRIuz ".%s.", HashTable_Count(dvcman->listeners) + 1, @@ -147,9 +147,9 @@ static UINT dvcman_register_plugin(IDRDYNVC_ENTRY_POINTS* pEntryPoints, const ch static IWTSPlugin* dvcman_get_plugin(IDRDYNVC_ENTRY_POINTS* pEntryPoints, const char* name) { IWTSPlugin* plugin = NULL; - size_t i; - size_t nc; - size_t pc; + size_t i = 0; + size_t nc = 0; + size_t pc = 0; WINPR_ASSERT(pEntryPoints); DVCMAN* dvcman = ((DVCMAN_ENTRY_POINTS*)pEntryPoints)->dvcman; if (!dvcman || !pEntryPoints || !name) @@ -215,7 +215,7 @@ static DVCMAN_CHANNEL* dvcman_get_channel_by_id(IWTSVirtualChannelManager* pChan UINT32 ChannelId, BOOL doRef) { DVCMAN* dvcman = (DVCMAN*)pChannelMgr; - DVCMAN_CHANNEL* dvcChannel; + DVCMAN_CHANNEL* dvcChannel = NULL; WINPR_ASSERT(dvcman); HashTable_Lock(dvcman->channelsById); @@ -281,7 +281,7 @@ static void channelByIdCleanerFn(void* value) static IWTSVirtualChannelManager* dvcman_new(drdynvcPlugin* plugin) { - wObject* obj; + wObject* obj = NULL; DVCMAN* dvcman = (DVCMAN*)calloc(1, sizeof(DVCMAN)); if (!dvcman) @@ -391,7 +391,7 @@ static void dvcman_channel_free(DVCMAN_CHANNEL* channel) static void dvcman_channel_unref(DVCMAN_CHANNEL* channel) { - DVCMAN* dvcman; + DVCMAN* dvcman = NULL; WINPR_ASSERT(channel); if (InterlockedDecrement(&channel->refCounter)) @@ -452,8 +452,8 @@ static UINT dvcman_call_on_receive(DVCMAN_CHANNEL* channel, wStream* data) static UINT dvcman_channel_close(DVCMAN_CHANNEL* channel, BOOL perRequest, BOOL fromHashTableFn) { UINT error = CHANNEL_RC_OK; - drdynvcPlugin* drdynvc; - DrdynvcClientContext* context; + drdynvcPlugin* drdynvc = NULL; + DrdynvcClientContext* context = NULL; WINPR_ASSERT(channel); switch (channel->state) @@ -511,7 +511,7 @@ static DVCMAN_CHANNEL* dvcman_channel_new(drdynvcPlugin* drdynvc, IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId, const char* ChannelName) { - DVCMAN_CHANNEL* channel; + DVCMAN_CHANNEL* channel = NULL; WINPR_ASSERT(drdynvc); WINPR_ASSERT(pChannelMgr); @@ -573,7 +573,7 @@ static void dvcman_free(drdynvcPlugin* drdynvc, IWTSVirtualChannelManager* pChan */ static UINT dvcman_init(drdynvcPlugin* drdynvc, IWTSVirtualChannelManager* pChannelMgr) { - size_t i; + size_t i = 0; DVCMAN* dvcman = (DVCMAN*)pChannelMgr; UINT error = CHANNEL_RC_OK; @@ -606,7 +606,7 @@ static UINT dvcman_write_channel(IWTSVirtualChannel* pChannel, ULONG cbSize, con void* pReserved) { BOOL close = FALSE; - UINT status; + UINT status = 0; DVCMAN_CHANNEL* channel = (DVCMAN_CHANNEL*)pChannel; WINPR_UNUSED(pReserved); @@ -649,11 +649,11 @@ static DVCMAN_CHANNEL* dvcman_create_channel(drdynvcPlugin* drdynvc, IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId, const char* ChannelName, UINT* res) { - BOOL bAccept; + BOOL bAccept = 0; DVCMAN_CHANNEL* channel = NULL; - DrdynvcClientContext* context; + DrdynvcClientContext* context = NULL; DVCMAN* dvcman = (DVCMAN*)pChannelMgr; - DVCMAN_LISTENER* listener; + DVCMAN_LISTENER* listener = NULL; IWTSVirtualChannelCallback* pCallback = NULL; WINPR_ASSERT(dvcman); @@ -759,7 +759,7 @@ out: */ static UINT dvcman_open_channel(drdynvcPlugin* drdynvc, DVCMAN_CHANNEL* channel) { - IWTSVirtualChannelCallback* pCallback; + IWTSVirtualChannelCallback* pCallback = NULL; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(drdynvc); @@ -861,7 +861,7 @@ out: static UINT8 drdynvc_write_variable_uint(wStream* s, UINT32 val) { - UINT8 cb; + UINT8 cb = 0; if (val <= 0xFF) { @@ -889,7 +889,7 @@ static UINT8 drdynvc_write_variable_uint(wStream* s, UINT32 val) */ static UINT drdynvc_send(drdynvcPlugin* drdynvc, wStream* s) { - UINT status; + UINT status = 0; if (!drdynvc) status = CHANNEL_RC_BAD_CHANNEL_HANDLE; @@ -932,13 +932,13 @@ static UINT drdynvc_send(drdynvcPlugin* drdynvc, wStream* s) static UINT drdynvc_write_data(drdynvcPlugin* drdynvc, UINT32 ChannelId, const BYTE* data, UINT32 dataSize, BOOL* close) { - wStream* data_out; - size_t pos; - UINT8 cbChId; - UINT8 cbLen; - unsigned long chunkLength; + wStream* data_out = NULL; + size_t pos = 0; + UINT8 cbChId = 0; + UINT8 cbLen = 0; + unsigned long chunkLength = 0; UINT status = CHANNEL_RC_BAD_INIT_HANDLE; - DVCMAN* dvcman; + DVCMAN* dvcman = NULL; if (!drdynvc) return CHANNEL_RC_BAD_CHANNEL_HANDLE; @@ -1033,9 +1033,9 @@ static UINT drdynvc_write_data(drdynvcPlugin* drdynvc, UINT32 ChannelId, const B */ static UINT drdynvc_send_capability_response(drdynvcPlugin* drdynvc) { - UINT status; - wStream* s; - DVCMAN* dvcman; + UINT status = 0; + wStream* s = NULL; + DVCMAN* dvcman = NULL; if (!drdynvc) return CHANNEL_RC_BAD_CHANNEL_HANDLE; @@ -1073,7 +1073,7 @@ static UINT drdynvc_send_capability_response(drdynvcPlugin* drdynvc) static UINT drdynvc_process_capability_request(drdynvcPlugin* drdynvc, int Sp, int cbChId, wStream* s) { - UINT status; + UINT status = 0; if (!drdynvc) return CHANNEL_RC_BAD_INIT_HANDLE; @@ -1121,7 +1121,7 @@ static UINT32 drdynvc_cblen_to_bytes(int cbLen) static UINT32 drdynvc_read_variable_uint(wStream* s, int cbLen) { - UINT32 val; + UINT32 val = 0; switch (cbLen) { @@ -1148,12 +1148,12 @@ static UINT32 drdynvc_read_variable_uint(wStream* s, int cbLen) */ static UINT drdynvc_process_create_request(drdynvcPlugin* drdynvc, int Sp, int cbChId, wStream* s) { - UINT status; - wStream* data_out; - UINT channel_status; - DVCMAN* dvcman; - DVCMAN_CHANNEL* channel; - UINT32 retStatus; + UINT status = 0; + wStream* data_out = NULL; + UINT channel_status = 0; + DVCMAN* dvcman = NULL; + DVCMAN_CHANNEL* channel = NULL; + UINT32 retStatus = 0; WINPR_UNUSED(Sp); if (!drdynvc) @@ -1259,9 +1259,9 @@ static UINT drdynvc_process_data_first(drdynvcPlugin* drdynvc, int Sp, int cbChI UINT32 ThreadingFlags) { UINT status = CHANNEL_RC_OK; - UINT32 Length; - UINT32 ChannelId; - DVCMAN_CHANNEL* channel; + UINT32 Length = 0; + UINT32 ChannelId = 0; + DVCMAN_CHANNEL* channel = NULL; WINPR_ASSERT(drdynvc); if (!Stream_CheckAndLogRequiredLength( @@ -1310,8 +1310,8 @@ out: static UINT drdynvc_process_data(drdynvcPlugin* drdynvc, int Sp, int cbChId, wStream* s, UINT32 ThreadingFlags) { - UINT32 ChannelId; - DVCMAN_CHANNEL* channel; + UINT32 ChannelId = 0; + DVCMAN_CHANNEL* channel = NULL; UINT status = CHANNEL_RC_OK; WINPR_ASSERT(drdynvc); @@ -1353,8 +1353,8 @@ out: */ static UINT drdynvc_process_close_request(drdynvcPlugin* drdynvc, int Sp, int cbChId, wStream* s) { - UINT32 ChannelId; - DVCMAN_CHANNEL* channel; + UINT32 ChannelId = 0; + DVCMAN_CHANNEL* channel = NULL; WINPR_ASSERT(drdynvc); if (!Stream_CheckAndLogRequiredLength(TAG, s, drdynvc_cblen_to_bytes(cbChId))) @@ -1430,7 +1430,7 @@ static UINT drdynvc_virtual_channel_event_data_received(drdynvcPlugin* drdynvc, UINT32 dataLength, UINT32 totalLength, UINT32 dataFlags) { - wStream* data_in; + wStream* data_in = NULL; WINPR_ASSERT(drdynvc); if ((dataFlags & CHANNEL_FLAG_SUSPEND) || (dataFlags & CHANNEL_FLAG_RESUME)) @@ -1611,7 +1611,7 @@ static DWORD WINAPI drdynvc_virtual_channel_client_thread(LPVOID arg) static void drdynvc_queue_object_free(void* obj) { - wStream* s; + wStream* s = NULL; wMessage* msg = (wMessage*)obj; if (!msg || (msg->id != 0)) @@ -1626,7 +1626,7 @@ static void drdynvc_queue_object_free(void* obj) static UINT drdynvc_virtual_channel_event_initialized(drdynvcPlugin* drdynvc, LPVOID pData, UINT32 dataLength) { - wObject* obj; + wObject* obj = NULL; WINPR_UNUSED(pData); WINPR_UNUSED(dataLength); @@ -1664,10 +1664,10 @@ error: static UINT drdynvc_virtual_channel_event_connected(drdynvcPlugin* drdynvc, LPVOID pData, UINT32 dataLength) { - UINT error; - UINT32 status; - UINT32 index; - rdpSettings* settings; + UINT error = 0; + UINT32 status = 0; + UINT32 index = 0; + rdpSettings* settings = NULL; WINPR_ASSERT(drdynvc); WINPR_UNUSED(pData); @@ -1733,7 +1733,7 @@ error: */ static UINT drdynvc_virtual_channel_event_disconnected(drdynvcPlugin* drdynvc) { - UINT status; + UINT status = 0; if (!drdynvc) return CHANNEL_RC_BAD_CHANNEL_HANDLE; @@ -1828,8 +1828,8 @@ static UINT drdynvc_virtual_channel_event_terminated(drdynvcPlugin* drdynvc) static UINT drdynvc_virtual_channel_event_attached(drdynvcPlugin* drdynvc) { UINT error = CHANNEL_RC_OK; - size_t i; - DVCMAN* dvcman; + size_t i = 0; + DVCMAN* dvcman = NULL; if (!drdynvc) return CHANNEL_RC_BAD_CHANNEL_HANDLE; @@ -1860,8 +1860,8 @@ fail: static UINT drdynvc_virtual_channel_event_detached(drdynvcPlugin* drdynvc) { UINT error = CHANNEL_RC_OK; - size_t i; - DVCMAN* dvcman; + size_t i = 0; + DVCMAN* dvcman = NULL; if (!drdynvc) return CHANNEL_RC_BAD_CHANNEL_HANDLE; @@ -1976,10 +1976,10 @@ static int drdynvc_get_version(DrdynvcClientContext* context) FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_EX pEntryPoints, PVOID pInitHandle)) { - UINT rc; - drdynvcPlugin* drdynvc; + UINT rc = 0; + drdynvcPlugin* drdynvc = NULL; DrdynvcClientContext* context = NULL; - CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx; + CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = NULL; drdynvc = (drdynvcPlugin*)calloc(1, sizeof(drdynvcPlugin)); WINPR_ASSERT(pEntryPoints); diff --git a/channels/drdynvc/server/drdynvc_main.c b/channels/drdynvc/server/drdynvc_main.c index 6ac6fc1e7..d8cbf2462 100644 --- a/channels/drdynvc/server/drdynvc_main.c +++ b/channels/drdynvc/server/drdynvc_main.c @@ -153,7 +153,7 @@ static UINT drdynvc_server_start(DrdynvcServerContext* context) */ static UINT drdynvc_server_stop(DrdynvcServerContext* context) { - UINT error; + UINT error = 0; SetEvent(context->priv->StopEvent); if (WaitForSingleObject(context->priv->Thread, INFINITE) == WAIT_FAILED) @@ -169,7 +169,7 @@ static UINT drdynvc_server_stop(DrdynvcServerContext* context) DrdynvcServerContext* drdynvc_server_context_new(HANDLE vcm) { - DrdynvcServerContext* context; + DrdynvcServerContext* context = NULL; context = (DrdynvcServerContext*)calloc(1, sizeof(DrdynvcServerContext)); if (context) diff --git a/channels/drive/client/drive_file.c b/channels/drive/client/drive_file.c index c5babe608..4aafa039f 100644 --- a/channels/drive/client/drive_file.c +++ b/channels/drive/client/drive_file.c @@ -61,7 +61,7 @@ static BOOL drive_file_fix_path(WCHAR* path, size_t length) { - size_t i; + size_t i = 0; if ((length == 0) || (length > UINT32_MAX)) return FALSE; @@ -97,7 +97,7 @@ static WCHAR* drive_file_combine_fullpath(const WCHAR* base_path, const WCHAR* p { BOOL ok = FALSE; WCHAR* fullpath = NULL; - size_t length; + size_t length = 0; if (!base_path || (!path && (PathWCharLength > 0))) goto fail; @@ -292,7 +292,7 @@ DRIVE_FILE* drive_file_new(const WCHAR* base_path, const WCHAR* path, UINT32 Pat UINT32 id, UINT32 DesiredAccess, UINT32 CreateDisposition, UINT32 CreateOptions, UINT32 FileAttributes, UINT32 SharedAccess) { - DRIVE_FILE* file; + DRIVE_FILE* file = NULL; if (!base_path || (!path && (PathWCharLength > 0))) return NULL; @@ -381,7 +381,7 @@ BOOL drive_file_seek(DRIVE_FILE* file, UINT64 Offset) BOOL drive_file_read(DRIVE_FILE* file, BYTE* buffer, UINT32* Length) { - DWORD read; + DWORD read = 0; if (!file || !buffer || !Length) return FALSE; @@ -399,7 +399,7 @@ BOOL drive_file_read(DRIVE_FILE* file, BYTE* buffer, UINT32* Length) BOOL drive_file_write(DRIVE_FILE* file, const BYTE* buffer, UINT32 Length) { - DWORD written; + DWORD written = 0; if (!file || !buffer) return FALSE; @@ -549,8 +549,8 @@ static BOOL drive_file_query_from_attributes(const DRIVE_FILE* file, BOOL drive_file_query_information(DRIVE_FILE* file, UINT32 FsInformationClass, wStream* output) { BY_HANDLE_FILE_INFORMATION fileInformation = { 0 }; - BOOL status; - HANDLE hFile; + BOOL status = 0; + HANDLE hFile = NULL; if (!file || !output) return FALSE; @@ -589,8 +589,8 @@ out_fail: BOOL drive_file_set_information(DRIVE_FILE* file, UINT32 FsInformationClass, UINT32 Length, wStream* input) { - INT64 size; - WCHAR* fullpath; + INT64 size = 0; + WCHAR* fullpath = NULL; ULARGE_INTEGER liCreationTime; ULARGE_INTEGER liLastAccessTime; ULARGE_INTEGER liLastWriteTime; @@ -601,12 +601,12 @@ BOOL drive_file_set_information(DRIVE_FILE* file, UINT32 FsInformationClass, UIN FILETIME* pftCreationTime = NULL; FILETIME* pftLastAccessTime = NULL; FILETIME* pftLastWriteTime = NULL; - UINT32 FileAttributes; - UINT32 FileNameLength; + UINT32 FileAttributes = 0; + UINT32 FileNameLength = 0; LARGE_INTEGER liSize; - UINT8 delete_pending; - UINT8 ReplaceIfExists; - DWORD attr; + UINT8 delete_pending = 0; + UINT8 ReplaceIfExists = 0; + DWORD attr = 0; if (!file || !input) return FALSE; @@ -800,8 +800,8 @@ BOOL drive_file_set_information(DRIVE_FILE* file, UINT32 FsInformationClass, UIN BOOL drive_file_query_directory(DRIVE_FILE* file, UINT32 FsInformationClass, BYTE InitialQuery, const WCHAR* path, UINT32 PathWCharLength, wStream* output) { - size_t length; - WCHAR* ent_path; + size_t length = 0; + WCHAR* ent_path = NULL; if (!file || !path || !output) return FALSE; diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c index cf5cb54d4..7c4695983 100644 --- a/channels/drive/client/drive_main.c +++ b/channels/drive/client/drive_main.c @@ -65,7 +65,7 @@ typedef struct static DWORD drive_map_windows_err(DWORD fs_errno) { - DWORD rc; + DWORD rc = 0; /* try to return NTSTATUS version of error code */ @@ -149,17 +149,17 @@ static DRIVE_FILE* drive_get_file_by_id(DRIVE_DEVICE* drive, UINT32 id) */ static UINT drive_process_irp_create(DRIVE_DEVICE* drive, IRP* irp) { - UINT32 FileId; - DRIVE_FILE* file; - BYTE Information; - UINT32 FileAttributes; - UINT32 SharedAccess; - UINT32 DesiredAccess; - UINT32 CreateDisposition; - UINT32 CreateOptions; - UINT32 PathLength; - UINT64 allocationSize; - const WCHAR* path; + UINT32 FileId = 0; + DRIVE_FILE* file = NULL; + BYTE Information = 0; + UINT32 FileAttributes = 0; + UINT32 SharedAccess = 0; + UINT32 DesiredAccess = 0; + UINT32 CreateDisposition = 0; + UINT32 CreateOptions = 0; + UINT32 PathLength = 0; + UINT64 allocationSize = 0; + const WCHAR* path = NULL; if (!drive || !irp || !irp->devman || !irp->Complete) return ERROR_INVALID_PARAMETER; @@ -234,8 +234,8 @@ static UINT drive_process_irp_create(DRIVE_DEVICE* drive, IRP* irp) */ static UINT drive_process_irp_close(DRIVE_DEVICE* drive, IRP* irp) { - void* key; - DRIVE_FILE* file; + void* key = NULL; + DRIVE_FILE* file = NULL; if (!drive || !irp || !irp->Complete || !irp->output) return ERROR_INVALID_PARAMETER; @@ -266,9 +266,9 @@ static UINT drive_process_irp_close(DRIVE_DEVICE* drive, IRP* irp) */ static UINT drive_process_irp_read(DRIVE_DEVICE* drive, IRP* irp) { - DRIVE_FILE* file; - UINT32 Length; - UINT64 Offset; + DRIVE_FILE* file = NULL; + UINT32 Length = 0; + UINT64 Offset = 0; if (!drive || !irp || !irp->output || !irp->Complete) return ERROR_INVALID_PARAMETER; @@ -324,9 +324,9 @@ static UINT drive_process_irp_read(DRIVE_DEVICE* drive, IRP* irp) */ static UINT drive_process_irp_write(DRIVE_DEVICE* drive, IRP* irp) { - DRIVE_FILE* file; - UINT32 Length; - UINT64 Offset; + DRIVE_FILE* file = NULL; + UINT32 Length = 0; + UINT64 Offset = 0; if (!drive || !irp || !irp->input || !irp->output || !irp->Complete) return ERROR_INVALID_PARAMETER; @@ -370,8 +370,8 @@ static UINT drive_process_irp_write(DRIVE_DEVICE* drive, IRP* irp) */ static UINT drive_process_irp_query_information(DRIVE_DEVICE* drive, IRP* irp) { - DRIVE_FILE* file; - UINT32 FsInformationClass; + DRIVE_FILE* file = NULL; + UINT32 FsInformationClass = 0; if (!drive || !irp || !irp->Complete) return ERROR_INVALID_PARAMETER; @@ -401,9 +401,9 @@ static UINT drive_process_irp_query_information(DRIVE_DEVICE* drive, IRP* irp) */ static UINT drive_process_irp_set_information(DRIVE_DEVICE* drive, IRP* irp) { - DRIVE_FILE* file; - UINT32 FsInformationClass; - UINT32 Length; + DRIVE_FILE* file = NULL; + UINT32 FsInformationClass = 0; + UINT32 Length = 0; if (!drive || !irp || !irp->Complete || !irp->input || !irp->output) return ERROR_INVALID_PARAMETER; @@ -579,7 +579,7 @@ static UINT drive_process_irp_query_volume_information(DRIVE_DEVICE* drive, IRP* */ static UINT drive_process_irp_silent_ignore(DRIVE_DEVICE* drive, IRP* irp) { - UINT32 FsInformationClass; + UINT32 FsInformationClass = 0; if (!drive || !irp || !irp->output || !irp->Complete) return ERROR_INVALID_PARAMETER; @@ -599,11 +599,11 @@ static UINT drive_process_irp_silent_ignore(DRIVE_DEVICE* drive, IRP* irp) */ static UINT drive_process_irp_query_directory(DRIVE_DEVICE* drive, IRP* irp) { - const WCHAR* path; - DRIVE_FILE* file; - BYTE InitialQuery; - UINT32 PathLength; - UINT32 FsInformationClass; + const WCHAR* path = NULL; + DRIVE_FILE* file = NULL; + BYTE InitialQuery = 0; + UINT32 PathLength = 0; + UINT32 FsInformationClass = 0; if (!drive || !irp || !irp->Complete) return ERROR_INVALID_PARAMETER; @@ -683,7 +683,7 @@ static UINT drive_process_irp_device_control(DRIVE_DEVICE* drive, IRP* irp) */ static UINT drive_process_irp(DRIVE_DEVICE* drive, IRP* irp) { - UINT error; + UINT error = 0; if (!drive || !irp) return ERROR_INVALID_PARAMETER; @@ -886,9 +886,9 @@ static void drive_message_free(void* obj) static UINT drive_register_drive_path(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, const char* name, const char* path, BOOL automount) { - size_t i; - size_t length; - DRIVE_DEVICE* drive; + size_t i = 0; + size_t length = 0; + DRIVE_DEVICE* drive = NULL; UINT error = ERROR_INTERNAL_ERROR; if (!pEntryPoints || !name || !path) @@ -1012,8 +1012,8 @@ out_error: */ FREERDP_ENTRY_POINT(UINT drive_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)) { - RDPDR_DRIVE* drive; - UINT error; + RDPDR_DRIVE* drive = NULL; + UINT error = 0; #ifdef WIN32 char* dev; int len; diff --git a/channels/echo/server/echo_main.c b/channels/echo/server/echo_main.c index fb33fbd52..9c165261c 100644 --- a/channels/echo/server/echo_main.c +++ b/channels/echo/server/echo_main.c @@ -61,9 +61,9 @@ typedef struct */ static UINT echo_server_open_channel(echo_server* echo) { - DWORD Error; - HANDLE hEvent; - DWORD StartTick; + DWORD Error = 0; + HANDLE hEvent = NULL; + DWORD StartTick = 0; DWORD BytesReturned = 0; PULONG pSessionId = NULL; @@ -93,7 +93,7 @@ static UINT echo_server_open_channel(echo_server* echo) if (echo->echo_channel) { - UINT32 channelId; + UINT32 channelId = 0; BOOL status = TRUE; channelId = WTSChannelGetIdByHandle(echo->echo_channel); @@ -122,16 +122,16 @@ static UINT echo_server_open_channel(echo_server* echo) static DWORD WINAPI echo_server_thread_func(LPVOID arg) { - wStream* s; - void* buffer; - DWORD nCount; + wStream* s = NULL; + void* buffer = NULL; + DWORD nCount = 0; HANDLE events[8]; BOOL ready = FALSE; - HANDLE ChannelEvent; + HANDLE ChannelEvent = NULL; DWORD BytesReturned = 0; echo_server* echo = (echo_server*)arg; - UINT error; - DWORD status; + UINT error = 0; + DWORD status = 0; if ((error = echo_server_open_channel(echo))) { @@ -357,7 +357,7 @@ static BOOL echo_server_request(echo_server_context* context, const BYTE* buffer echo_server_context* echo_server_context_new(HANDLE vcm) { - echo_server* echo; + echo_server* echo = NULL; echo = (echo_server*)calloc(1, sizeof(echo_server)); if (echo) diff --git a/channels/encomsp/server/encomsp_main.c b/channels/encomsp/server/encomsp_main.c index 6f67e76db..f6390dfda 100644 --- a/channels/encomsp/server/encomsp_main.c +++ b/channels/encomsp/server/encomsp_main.c @@ -86,8 +86,8 @@ static UINT encomsp_recv_change_participant_control_level_pdu(EncomspServerConte wStream* s, ENCOMSP_ORDER_HEADER* header) { - int beg; - int end; + int beg = 0; + int end = 0; ENCOMSP_CHANGE_PARTICIPANT_CONTROL_LEVEL_PDU pdu; UINT error = CHANNEL_RC_OK; beg = ((int)Stream_GetPosition(s)) - ENCOMSP_ORDER_HEADER_SIZE; @@ -170,16 +170,16 @@ static UINT encomsp_server_receive_pdu(EncomspServerContext* context, wStream* s static DWORD WINAPI encomsp_server_thread(LPVOID arg) { - wStream* s; - DWORD nCount; - void* buffer; + wStream* s = NULL; + DWORD nCount = 0; + void* buffer = NULL; HANDLE events[8]; - HANDLE ChannelEvent; - DWORD BytesReturned; - ENCOMSP_ORDER_HEADER* header; - EncomspServerContext* context; + HANDLE ChannelEvent = NULL; + DWORD BytesReturned = 0; + ENCOMSP_ORDER_HEADER* header = NULL; + EncomspServerContext* context = NULL; UINT error = CHANNEL_RC_OK; - DWORD status; + DWORD status = 0; context = (EncomspServerContext*)arg; buffer = NULL; @@ -338,7 +338,7 @@ static UINT encomsp_server_stop(EncomspServerContext* context) EncomspServerContext* encomsp_server_context_new(HANDLE vcm) { - EncomspServerContext* context; + EncomspServerContext* context = NULL; context = (EncomspServerContext*)calloc(1, sizeof(EncomspServerContext)); if (context) diff --git a/channels/geometry/client/geometry_main.c b/channels/geometry/client/geometry_main.c index eed3aa13c..0a179ee23 100644 --- a/channels/geometry/client/geometry_main.c +++ b/channels/geometry/client/geometry_main.c @@ -65,14 +65,14 @@ static void freerdp_rgndata_reset(FREERDP_RGNDATA* data) static UINT32 geometry_read_RGNDATA(wLog* logger, wStream* s, UINT32 len, FREERDP_RGNDATA* rgndata) { - UINT32 dwSize; - UINT32 iType; - INT32 right; - INT32 bottom; - INT32 x; - INT32 y; - INT32 w; - INT32 h; + UINT32 dwSize = 0; + UINT32 iType = 0; + INT32 right = 0; + INT32 bottom = 0; + INT32 x = 0; + INT32 y = 0; + INT32 w = 0; + INT32 h = 0; if (len < 32) { @@ -122,7 +122,7 @@ static UINT32 geometry_read_RGNDATA(wLog* logger, wStream* s, UINT32 len, FREERD if (rgndata->nRectCount) { - UINT32 i; + UINT32 i = 0; RDP_RECT* tmp = realloc(rgndata->rects, rgndata->nRectCount * sizeof(RDP_RECT)); if (!tmp) @@ -162,16 +162,16 @@ static UINT32 geometry_read_RGNDATA(wLog* logger, wStream* s, UINT32 len, FREERD */ static UINT geometry_recv_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - UINT32 length; - UINT32 cbGeometryBuffer; - MAPPED_GEOMETRY* mappedGeometry; - GEOMETRY_PLUGIN* geometry; - GeometryClientContext* context; + UINT32 length = 0; + UINT32 cbGeometryBuffer = 0; + MAPPED_GEOMETRY* mappedGeometry = NULL; + GEOMETRY_PLUGIN* geometry = NULL; + GeometryClientContext* context = NULL; UINT ret = CHANNEL_RC_OK; - UINT32 updateType; - UINT32 geometryType; - UINT64 id; - wLog* logger; + UINT32 updateType = 0; + UINT32 geometryType = 0; + UINT64 id = 0; + wLog* logger = NULL; geometry = (GEOMETRY_PLUGIN*)callback->plugin; logger = geometry->base.log; @@ -340,7 +340,7 @@ static const IWTSVirtualChannelCallback geometry_callbacks = { geometry_on_data_ static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, rdpSettings* settings) { - GeometryClientContext* context; + GeometryClientContext* context = NULL; GEOMETRY_PLUGIN* geometry = (GEOMETRY_PLUGIN*)base; WINPR_ASSERT(base); diff --git a/channels/location/server/location_main.c b/channels/location/server/location_main.c index 71a676657..bea88edee 100644 --- a/channels/location/server/location_main.c +++ b/channels/location/server/location_main.c @@ -75,10 +75,10 @@ static UINT location_server_open_channel(location_server* location) { LocationServerContext* context = &location->context; DWORD Error = ERROR_SUCCESS; - HANDLE hEvent; + HANDLE hEvent = NULL; DWORD BytesReturned = 0; PULONG pSessionId = NULL; - UINT32 channelId; + UINT32 channelId = 0; BOOL status = TRUE; WINPR_ASSERT(location); @@ -266,11 +266,11 @@ static UINT location_server_recv_location3d_delta(LocationServerContext* context static UINT location_process_message(location_server* location) { - BOOL rc; + BOOL rc = 0; UINT error = ERROR_INTERNAL_ERROR; - ULONG BytesReturned; + ULONG BytesReturned = 0; RDPLOCATION_HEADER header = { 0 }; - wStream* s; + wStream* s = NULL; WINPR_ASSERT(location); WINPR_ASSERT(location->location_channel); @@ -383,11 +383,11 @@ static HANDLE location_server_get_channel_handle(location_server* location) static DWORD WINAPI location_server_thread_func(LPVOID arg) { - DWORD nCount; + DWORD nCount = 0; HANDLE events[2] = { 0 }; location_server* location = (location_server*)arg; UINT error = CHANNEL_RC_OK; - DWORD status; + DWORD status = 0; WINPR_ASSERT(location); @@ -536,7 +536,7 @@ static UINT location_server_packet_send(LocationServerContext* context, wStream* { location_server* location = (location_server*)context; UINT error = CHANNEL_RC_OK; - ULONG written; + ULONG written = 0; WINPR_ASSERT(location); WINPR_ASSERT(s); @@ -563,9 +563,9 @@ out: static UINT location_server_send_server_ready(LocationServerContext* context, const RDPLOCATION_SERVER_READY_PDU* serverReady) { - wStream* s; - UINT32 pduLength; - UINT32 protocolVersion; + wStream* s = NULL; + UINT32 pduLength = 0; + UINT32 protocolVersion = 0; WINPR_ASSERT(context); WINPR_ASSERT(serverReady); diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c index 6629227e5..39057541f 100644 --- a/channels/parallel/client/parallel_main.c +++ b/channels/parallel/client/parallel_main.c @@ -77,7 +77,7 @@ typedef struct static UINT parallel_process_irp_create(PARALLEL_DEVICE* parallel, IRP* irp) { char* path = NULL; - UINT32 PathLength; + UINT32 PathLength = 0; if (!Stream_SafeSeek(irp->input, 28)) return ERROR_INVALID_DATA; /* DesiredAccess(4) AllocationSize(8), FileAttributes(4) */ @@ -141,9 +141,9 @@ static UINT parallel_process_irp_close(PARALLEL_DEVICE* parallel, IRP* irp) */ static UINT parallel_process_irp_read(PARALLEL_DEVICE* parallel, IRP* irp) { - UINT32 Length; - UINT64 Offset; - ssize_t status; + UINT32 Length = 0; + UINT64 Offset = 0; + ssize_t status = 0; BYTE* buffer = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, irp->input, 12)) return ERROR_INVALID_DATA; @@ -196,10 +196,10 @@ static UINT parallel_process_irp_read(PARALLEL_DEVICE* parallel, IRP* irp) */ static UINT parallel_process_irp_write(PARALLEL_DEVICE* parallel, IRP* irp) { - UINT32 len; - UINT32 Length; - UINT64 Offset; - ssize_t status; + UINT32 len = 0; + UINT32 Length = 0; + UINT64 Offset = 0; + ssize_t status = 0; if (!Stream_CheckAndLogRequiredLength(TAG, irp->input, 12)) return ERROR_INVALID_DATA; @@ -251,7 +251,7 @@ static UINT parallel_process_irp_device_control(PARALLEL_DEVICE* parallel, IRP* */ static UINT parallel_process_irp(PARALLEL_DEVICE* parallel, IRP* irp) { - UINT error; + UINT error = 0; switch (irp->MajorFunction) { @@ -376,7 +376,7 @@ static UINT parallel_irp_request(DEVICE* device, IRP* irp) */ static UINT parallel_free(DEVICE* device) { - UINT error; + UINT error = 0; PARALLEL_DEVICE* parallel = (PARALLEL_DEVICE*)device; if (!MessageQueue_PostQuit(parallel->queue, 0) || @@ -416,13 +416,13 @@ static void parallel_message_free(void* obj) */ FREERDP_ENTRY_POINT(UINT parallel_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)) { - char* name; - char* path; - size_t i; - size_t length; - RDPDR_PARALLEL* device; - PARALLEL_DEVICE* parallel; - UINT error; + char* name = NULL; + char* path = NULL; + size_t i = 0; + size_t length = 0; + RDPDR_PARALLEL* device = NULL; + PARALLEL_DEVICE* parallel = NULL; + UINT error = 0; WINPR_ASSERT(pEntryPoints); diff --git a/channels/printer/client/cups/printer_cups.c b/channels/printer/client/cups/printer_cups.c index e112f52e8..f1d77589a 100644 --- a/channels/printer/client/cups/printer_cups.c +++ b/channels/printer/client/cups/printer_cups.c @@ -156,7 +156,7 @@ static UINT printer_cups_write_printjob(rdpPrintJob* printjob, const BYTE* data, static void printer_cups_close_printjob(rdpPrintJob* printjob) { rdpCupsPrintJob* cups_printjob = (rdpCupsPrintJob*)printjob; - rdpCupsPrinter* cups_printer; + rdpCupsPrinter* cups_printer = NULL; WINPR_ASSERT(cups_printjob); @@ -177,7 +177,7 @@ static void printer_cups_close_printjob(rdpPrintJob* printjob) static rdpPrintJob* printer_cups_create_printjob(rdpPrinter* printer, UINT32 id) { rdpCupsPrinter* cups_printer = (rdpCupsPrinter*)printer; - rdpCupsPrintJob* cups_printjob; + rdpCupsPrintJob* cups_printjob = NULL; WINPR_ASSERT(cups_printer); @@ -291,7 +291,7 @@ static void printer_cups_release_ref_printer(rdpPrinter* printer) static rdpPrinter* printer_cups_new_printer(rdpCupsPrinterDriver* cups_driver, const char* name, const char* driverName, BOOL is_default) { - rdpCupsPrinter* cups_printer; + rdpCupsPrinter* cups_printer = NULL; cups_printer = (rdpCupsPrinter*)calloc(1, sizeof(rdpCupsPrinter)); if (!cups_printer) @@ -357,7 +357,7 @@ static rdpPrinter** printer_cups_enum_printers(rdpPrinterDriver* driver) int num_printers = 0; cups_dest_t* dests = NULL; cups_dest_t* dest = NULL; - int i; + int i = 0; BOOL haveDefault = FALSE; const int num_dests = cupsGetDests(&dests); diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c index 39874fbcb..46836cf0a 100644 --- a/channels/printer/client/printer_main.c +++ b/channels/printer/client/printer_main.c @@ -101,8 +101,8 @@ static BOOL printer_write_setting(const char* path, prn_conf_t type, const void* { DWORD written = 0; BOOL rc = FALSE; - HANDLE file; - size_t b64len; + HANDLE file = NULL; + size_t b64len = 0; char* base64 = NULL; const char* name = filemap[type]; char* abs = GetCombinedPath(path, name); @@ -156,11 +156,11 @@ static BOOL printer_config_valid(const char* path) static BOOL printer_read_setting(const char* path, prn_conf_t type, void** data, UINT32* length) { - DWORD lowSize; - DWORD highSize; + DWORD lowSize = 0; + DWORD highSize = 0; DWORD read = 0; BOOL rc = FALSE; - HANDLE file; + HANDLE file = NULL; char* fdata = NULL; const char* name = filemap[type]; char* abs = GetCombinedPath(path, name); @@ -291,7 +291,7 @@ static BOOL printer_load_from_config(const rdpSettings* settings, rdpPrinter* pr { BOOL res = FALSE; WCHAR* wname = NULL; - size_t wlen; + size_t wlen = 0; char* path = NULL; UINT32 flags = 0; void* DriverName = NULL; @@ -395,8 +395,8 @@ static BOOL printer_save_default_config(const rdpSettings* settings, rdpPrinter* BOOL res = FALSE; WCHAR* wname = NULL; WCHAR* driver = NULL; - size_t wlen; - size_t dlen; + size_t wlen = 0; + size_t dlen = 0; char* path = NULL; if (!settings || !printer || !printer->name || !printer->driver) @@ -503,8 +503,8 @@ static UINT printer_process_irp_close(PRINTER_DEVICE* printer_dev, IRP* irp) */ static UINT printer_process_irp_write(PRINTER_DEVICE* printer_dev, IRP* irp) { - UINT32 Length; - UINT64 Offset; + UINT32 Length = 0; + UINT64 Offset = 0; rdpPrintJob* printjob = NULL; UINT error = CHANNEL_RC_OK; @@ -571,7 +571,7 @@ static UINT printer_process_irp_device_control(PRINTER_DEVICE* printer_dev, IRP* */ static UINT printer_process_irp(PRINTER_DEVICE* printer_dev, IRP* irp) { - UINT error; + UINT error = 0; WINPR_ASSERT(printer_dev); WINPR_ASSERT(irp); @@ -626,7 +626,7 @@ static UINT printer_process_irp(PRINTER_DEVICE* printer_dev, IRP* irp) static DWORD WINAPI printer_thread_func(LPVOID arg) { - IRP* irp; + IRP* irp = NULL; PRINTER_DEVICE* printer_dev = (PRINTER_DEVICE*)arg; UINT error = CHANNEL_RC_OK; @@ -692,7 +692,7 @@ static UINT printer_irp_request(DEVICE* device, IRP* irp) static UINT printer_custom_component(DEVICE* device, UINT16 component, UINT16 packetId, wStream* s) { - UINT32 eventID; + UINT32 eventID = 0; PRINTER_DEVICE* printer_dev = (PRINTER_DEVICE*)device; WINPR_ASSERT(printer_dev); @@ -717,14 +717,14 @@ static UINT printer_custom_component(DEVICE* device, UINT16 component, UINT16 pa case RDPDR_ADD_PRINTER_EVENT: { char PortDosName[8]; - UINT32 PnPNameLen; - UINT32 DriverNameLen; - UINT32 PrintNameLen; - UINT32 CacheFieldsLen; - const WCHAR* PnPName; - const WCHAR* DriverName; - const WCHAR* PrinterName; - const BYTE* CachedPrinterConfigData; + UINT32 PnPNameLen = 0; + UINT32 DriverNameLen = 0; + UINT32 PrintNameLen = 0; + UINT32 CacheFieldsLen = 0; + const WCHAR* PnPName = NULL; + const WCHAR* DriverName = NULL; + const WCHAR* PrinterName = NULL; + const BYTE* CachedPrinterConfigData = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, s, 24)) return ERROR_INVALID_DATA; @@ -769,10 +769,10 @@ static UINT printer_custom_component(DEVICE* device, UINT16 component, UINT16 pa case RDPDR_UPDATE_PRINTER_EVENT: { - UINT32 PrinterNameLen; - UINT32 ConfigDataLen; - const WCHAR* PrinterName; - const BYTE* ConfigData; + UINT32 PrinterNameLen = 0; + UINT32 ConfigDataLen = 0; + const WCHAR* PrinterName = NULL; + const BYTE* ConfigData = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) return ERROR_INVALID_DATA; @@ -800,8 +800,8 @@ static UINT printer_custom_component(DEVICE* device, UINT16 component, UINT16 pa case RDPDR_DELETE_PRINTER_EVENT: { - UINT32 PrinterNameLen; - const WCHAR* PrinterName; + UINT32 PrinterNameLen = 0; + const WCHAR* PrinterName = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) return ERROR_INVALID_DATA; @@ -819,10 +819,10 @@ static UINT printer_custom_component(DEVICE* device, UINT16 component, UINT16 pa case RDPDR_RENAME_PRINTER_EVENT: { - UINT32 OldPrinterNameLen; - UINT32 NewPrinterNameLen; - const WCHAR* OldPrinterName; - const WCHAR* NewPrinterName; + UINT32 OldPrinterNameLen = 0; + UINT32 NewPrinterNameLen = 0; + const WCHAR* OldPrinterName = NULL; + const WCHAR* NewPrinterName = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) return ERROR_INVALID_DATA; @@ -857,7 +857,7 @@ static UINT printer_custom_component(DEVICE* device, UINT16 component, UINT16 pa case PAKID_PRN_USING_XPS: { - UINT32 flags; + UINT32 flags = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) return ERROR_INVALID_DATA; @@ -885,9 +885,9 @@ static UINT printer_custom_component(DEVICE* device, UINT16 component, UINT16 pa */ static UINT printer_free(DEVICE* device) { - IRP* irp; + IRP* irp = NULL; PRINTER_DEVICE* printer_dev = (PRINTER_DEVICE*)device; - UINT error; + UINT error = 0; WINPR_ASSERT(printer_dev); @@ -935,7 +935,7 @@ static UINT printer_free(DEVICE* device) */ static UINT printer_register(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, rdpPrinter* printer) { - PRINTER_DEVICE* printer_dev; + PRINTER_DEVICE* printer_dev = NULL; UINT error = ERROR_INTERNAL_ERROR; WINPR_ASSERT(pEntryPoints); @@ -1041,8 +1041,8 @@ static rdpPrinterDriver* printer_load_backend(const char* backend) */ FREERDP_ENTRY_POINT(UINT printer_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)) { - char* name; - char* driver_name; + char* name = NULL; + char* driver_name = NULL; BOOL default_backend = TRUE; RDPDR_PRINTER* device = NULL; rdpPrinterDriver* driver = NULL; diff --git a/channels/rail/client/client_rails.c b/channels/rail/client/client_rails.c index 6eced998f..ee6db44d6 100644 --- a/channels/rail/client/client_rails.c +++ b/channels/rail/client/client_rails.c @@ -6,7 +6,7 @@ UINT client_rail_server_start_cmd(RailClientContext* context) { - UINT status; + UINT status = 0; char argsAndFile[520] = { 0 }; RAIL_EXEC_ORDER exec = { 0 }; RAIL_SYSPARAM_ORDER sysparam = { 0 }; diff --git a/channels/rail/client/rail_main.c b/channels/rail/client/rail_main.c index 63fcd4c81..c5828c110 100644 --- a/channels/rail/client/rail_main.c +++ b/channels/rail/client/rail_main.c @@ -38,7 +38,7 @@ RailClientContext* rail_get_client_interface(railPlugin* rail) { - RailClientContext* pInterface; + RailClientContext* pInterface = NULL; if (!rail) return NULL; @@ -54,7 +54,7 @@ RailClientContext* rail_get_client_interface(railPlugin* rail) */ static UINT rail_send(railPlugin* rail, wStream* s) { - UINT status; + UINT status = 0; if (!rail) { @@ -82,8 +82,8 @@ static UINT rail_send(railPlugin* rail, wStream* s) */ UINT rail_send_channel_data(railPlugin* rail, wStream* src) { - wStream* s; - size_t length; + wStream* s = NULL; + size_t length = 0; if (!rail || !src) return ERROR_INVALID_PARAMETER; @@ -112,10 +112,10 @@ UINT rail_send_channel_data(railPlugin* rail, wStream* src) */ static UINT rail_client_execute(RailClientContext* context, const RAIL_EXEC_ORDER* exec) { - char* exeOrFile; - UINT error; - railPlugin* rail; - UINT16 flags; + char* exeOrFile = NULL; + UINT error = 0; + railPlugin* rail = NULL; + UINT16 flags = 0; RAIL_UNICODE_STRING ruExeOrFile = { 0 }; RAIL_UNICODE_STRING ruWorkingDir = { 0 }; RAIL_UNICODE_STRING ruArguments = { 0 }; @@ -153,7 +153,7 @@ static UINT rail_client_execute(RailClientContext* context, const RAIL_EXEC_ORDE */ static UINT rail_client_activate(RailClientContext* context, const RAIL_ACTIVATE_ORDER* activate) { - railPlugin* rail; + railPlugin* rail = NULL; if (!context || !activate) return ERROR_INVALID_PARAMETER; @@ -169,11 +169,11 @@ static UINT rail_client_activate(RailClientContext* context, const RAIL_ACTIVATE */ static UINT rail_send_client_sysparam(RailClientContext* context, RAIL_SYSPARAM_ORDER* sysparam) { - wStream* s; + wStream* s = NULL; size_t length = RAIL_SYSPARAM_ORDER_LENGTH; - railPlugin* rail; - UINT error; - BOOL extendedSpiSupported; + railPlugin* rail = NULL; + UINT error = 0; + BOOL extendedSpiSupported = 0; if (!context || !sysparam) return ERROR_INVALID_PARAMETER; @@ -342,7 +342,7 @@ static UINT rail_client_system_param(RailClientContext* context, static UINT rail_client_system_command(RailClientContext* context, const RAIL_SYSCOMMAND_ORDER* syscommand) { - railPlugin* rail; + railPlugin* rail = NULL; if (!context || !syscommand) return ERROR_INVALID_PARAMETER; @@ -358,7 +358,7 @@ static UINT rail_client_system_command(RailClientContext* context, */ static UINT rail_client_handshake(RailClientContext* context, const RAIL_HANDSHAKE_ORDER* handshake) { - railPlugin* rail; + railPlugin* rail = NULL; if (!context || !handshake) return ERROR_INVALID_PARAMETER; @@ -375,7 +375,7 @@ static UINT rail_client_handshake(RailClientContext* context, const RAIL_HANDSHA static UINT rail_client_notify_event(RailClientContext* context, const RAIL_NOTIFY_EVENT_ORDER* notifyEvent) { - railPlugin* rail; + railPlugin* rail = NULL; if (!context || !notifyEvent) return ERROR_INVALID_PARAMETER; @@ -392,7 +392,7 @@ static UINT rail_client_notify_event(RailClientContext* context, static UINT rail_client_window_move(RailClientContext* context, const RAIL_WINDOW_MOVE_ORDER* windowMove) { - railPlugin* rail; + railPlugin* rail = NULL; if (!context || !windowMove) return ERROR_INVALID_PARAMETER; @@ -409,7 +409,7 @@ static UINT rail_client_window_move(RailClientContext* context, static UINT rail_client_information(RailClientContext* context, const RAIL_CLIENT_STATUS_ORDER* clientStatus) { - railPlugin* rail; + railPlugin* rail = NULL; if (!context || !clientStatus) return ERROR_INVALID_PARAMETER; @@ -425,7 +425,7 @@ static UINT rail_client_information(RailClientContext* context, */ static UINT rail_client_system_menu(RailClientContext* context, const RAIL_SYSMENU_ORDER* sysmenu) { - railPlugin* rail; + railPlugin* rail = NULL; if (!context || !sysmenu) return ERROR_INVALID_PARAMETER; @@ -442,7 +442,7 @@ static UINT rail_client_system_menu(RailClientContext* context, const RAIL_SYSME static UINT rail_client_language_bar_info(RailClientContext* context, const RAIL_LANGBAR_INFO_ORDER* langBarInfo) { - railPlugin* rail; + railPlugin* rail = NULL; if (!context || !langBarInfo) return ERROR_INVALID_PARAMETER; @@ -454,7 +454,7 @@ static UINT rail_client_language_bar_info(RailClientContext* context, static UINT rail_client_language_ime_info(RailClientContext* context, const RAIL_LANGUAGEIME_INFO_ORDER* langImeInfo) { - railPlugin* rail; + railPlugin* rail = NULL; if (!context || !langImeInfo) return ERROR_INVALID_PARAMETER; @@ -471,7 +471,7 @@ static UINT rail_client_language_ime_info(RailClientContext* context, static UINT rail_client_get_appid_request(RailClientContext* context, const RAIL_GET_APPID_REQ_ORDER* getAppIdReq) { - railPlugin* rail; + railPlugin* rail = NULL; if (!context || !getAppIdReq || !context->handle) return ERROR_INVALID_PARAMETER; @@ -483,7 +483,7 @@ static UINT rail_client_get_appid_request(RailClientContext* context, static UINT rail_client_compartment_info(RailClientContext* context, const RAIL_COMPARTMENT_INFO_ORDER* compartmentInfo) { - railPlugin* rail; + railPlugin* rail = NULL; if (!context || !compartmentInfo || !context->handle) return ERROR_INVALID_PARAMETER; @@ -494,7 +494,7 @@ static UINT rail_client_compartment_info(RailClientContext* context, static UINT rail_client_cloak(RailClientContext* context, const RAIL_CLOAK* cloak) { - railPlugin* rail; + railPlugin* rail = NULL; if (!context || !cloak || !context->handle) return ERROR_INVALID_PARAMETER; @@ -505,7 +505,7 @@ static UINT rail_client_cloak(RailClientContext* context, const RAIL_CLOAK* cloa static UINT rail_client_snap_arrange(RailClientContext* context, const RAIL_SNAP_ARRANGE* snap) { - railPlugin* rail; + railPlugin* rail = NULL; if (!context || !snap || !context->handle) return ERROR_INVALID_PARAMETER; @@ -598,7 +598,7 @@ static UINT rail_virtual_channel_event_connected(railPlugin* rail, LPVOID pData, */ static UINT rail_virtual_channel_event_disconnected(railPlugin* rail) { - UINT rc; + UINT rc = 0; channel_client_quit_handler(rail->MsgsHandle); if (rail->OpenHandle == 0) @@ -676,10 +676,10 @@ static VOID VCAPITYPE rail_virtual_channel_init_event_ex(LPVOID lpUserParam, LPV FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, PVOID pInitHandle)) { - UINT rc; - railPlugin* rail; + UINT rc = 0; + railPlugin* rail = NULL; RailClientContext* context = NULL; - CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx; + CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = NULL; BOOL isFreerdp = FALSE; rail = (railPlugin*)calloc(1, sizeof(railPlugin)); diff --git a/channels/rail/client/rail_orders.c b/channels/rail/client/rail_orders.c index 522ddc2f3..7ac432e38 100644 --- a/channels/rail/client/rail_orders.c +++ b/channels/rail/client/rail_orders.c @@ -41,7 +41,7 @@ static BOOL rail_is_feature_supported(const rdpContext* context, UINT32 featureM UINT rail_send_pdu(railPlugin* rail, wStream* s, UINT16 orderType) { char buffer[128] = { 0 }; - UINT16 orderLength; + UINT16 orderLength = 0; if (!rail || !s) return ERROR_INVALID_PARAMETER; @@ -110,7 +110,7 @@ static UINT rail_read_server_minmaxinfo_order(wStream* s, RAIL_MINMAXINFO_ORDER* static UINT rail_read_server_localmovesize_order(wStream* s, RAIL_LOCALMOVESIZE_ORDER* localMoveSize) { - UINT16 isMoveSizeStart; + UINT16 isMoveSizeStart = 0; if (!s || !localMoveSize) return ERROR_INVALID_PARAMETER; @@ -184,7 +184,7 @@ static UINT rail_write_client_exec_order(wStream* s, UINT16 flags, const RAIL_UNICODE_STRING* workingDir, const RAIL_UNICODE_STRING* arguments) { - UINT error; + UINT error = 0; if (!s || !exeOrFile || !workingDir || !arguments) return ERROR_INVALID_PARAMETER; @@ -228,7 +228,7 @@ static UINT rail_write_client_exec_order(wStream* s, UINT16 flags, static UINT rail_write_client_activate_order(wStream* s, const RAIL_ACTIVATE_ORDER* activate) { - BYTE enabled; + BYTE enabled = 0; if (!s || !activate) return ERROR_INVALID_PARAMETER; @@ -341,7 +341,7 @@ static UINT rail_recv_handshake_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); RAIL_HANDSHAKE_ORDER serverHandshake = { 0 }; - UINT error; + UINT error = 0; if (!context || !s) return ERROR_INVALID_PARAMETER; @@ -392,7 +392,7 @@ static UINT rail_recv_compartmentinfo_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); RAIL_COMPARTMENT_INFO_ORDER pdu = { 0 }; - UINT error; + UINT error = 0; if (!context || !s) return ERROR_INVALID_PARAMETER; @@ -416,8 +416,8 @@ static UINT rail_recv_compartmentinfo_order(railPlugin* rail, wStream* s) BOOL rail_is_feature_supported(const rdpContext* context, UINT32 featureMask) { - UINT32 supported; - UINT32 masked; + UINT32 supported = 0; + UINT32 masked = 0; if (!context || !context->settings) return FALSE; @@ -452,7 +452,7 @@ static UINT rail_recv_handshake_ex_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); RAIL_HANDSHAKE_EX_ORDER serverHandshake = { 0 }; - UINT error; + UINT error = 0; if (!rail || !context || !s) return ERROR_INVALID_PARAMETER; @@ -501,7 +501,7 @@ static UINT rail_recv_exec_result_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); RAIL_EXEC_RESULT_ORDER execResult = { 0 }; - UINT error; + UINT error = 0; if (!context || !s) return ERROR_INVALID_PARAMETER; @@ -534,8 +534,8 @@ static UINT rail_recv_server_sysparam_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); RAIL_SYSPARAM_ORDER sysparam; - UINT error; - BOOL extendedSpiSupported; + UINT error = 0; + BOOL extendedSpiSupported = 0; if (!context || !s) return ERROR_INVALID_PARAMETER; @@ -567,7 +567,7 @@ static UINT rail_recv_server_minmaxinfo_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); RAIL_MINMAXINFO_ORDER minMaxInfo = { 0 }; - UINT error; + UINT error = 0; if (!context || !s) return ERROR_INVALID_PARAMETER; @@ -598,7 +598,7 @@ static UINT rail_recv_server_localmovesize_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); RAIL_LOCALMOVESIZE_ORDER localMoveSize = { 0 }; - UINT error; + UINT error = 0; if (!context || !s) return ERROR_INVALID_PARAMETER; @@ -629,7 +629,7 @@ static UINT rail_recv_server_get_appid_resp_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); RAIL_GET_APPID_RESP_ORDER getAppIdResp = { 0 }; - UINT error; + UINT error = 0; if (!context || !s) return ERROR_INVALID_PARAMETER; @@ -661,7 +661,7 @@ static UINT rail_recv_langbar_info_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); RAIL_LANGBAR_INFO_ORDER langBarInfo = { 0 }; - UINT error; + UINT error = 0; if (!context) return ERROR_INVALID_PARAMETER; @@ -704,7 +704,7 @@ static UINT rail_recv_taskbar_info_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); RAIL_TASKBAR_INFO_ORDER taskBarInfo = { 0 }; - UINT error; + UINT error = 0; if (!context) return ERROR_INVALID_PARAMETER; @@ -747,7 +747,7 @@ static UINT rail_recv_zorder_sync_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); RAIL_ZORDER_SYNC zorder = { 0 }; - UINT error; + UINT error = 0; if (!context) return ERROR_INVALID_PARAMETER; @@ -774,7 +774,7 @@ static UINT rail_recv_zorder_sync_order(railPlugin* rail, wStream* s) static UINT rail_read_cloak_order(wStream* s, RAIL_CLOAK* cloak) { - BYTE cloaked; + BYTE cloaked = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, RAIL_CLOAK_ORDER_LENGTH)) return ERROR_INVALID_DATA; @@ -789,7 +789,7 @@ static UINT rail_recv_cloak_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); RAIL_CLOAK cloak = { 0 }; - UINT error; + UINT error = 0; if (!context) return ERROR_INVALID_PARAMETER; @@ -818,7 +818,7 @@ static UINT rail_recv_cloak_order(railPlugin* rail, wStream* s) static UINT rail_read_power_display_request_order(wStream* s, RAIL_POWER_DISPLAY_REQUEST* power) { - UINT32 active; + UINT32 active = 0; if (!s || !power) return ERROR_INVALID_PARAMETER; @@ -835,7 +835,7 @@ static UINT rail_recv_power_display_request_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); RAIL_POWER_DISPLAY_REQUEST power = { 0 }; - UINT error; + UINT error = 0; if (!context) return ERROR_INVALID_PARAMETER; @@ -898,7 +898,7 @@ static UINT rail_recv_get_application_id_extended_response_order(railPlugin* rai { RailClientContext* context = rail_get_client_interface(rail); RAIL_GET_APPID_RESP_EX id = { 0 }; - UINT error; + UINT error = 0; if (!context) return ERROR_INVALID_PARAMETER; @@ -939,7 +939,7 @@ static UINT rail_recv_textscaleinfo_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); UINT32 TextScaleFactor = 0; - UINT error; + UINT error = 0; if (!context) return ERROR_INVALID_PARAMETER; @@ -973,7 +973,7 @@ static UINT rail_recv_caretblinkinfo_order(railPlugin* rail, wStream* s) { RailClientContext* context = rail_get_client_interface(rail); UINT32 CaretBlinkRate = 0; - UINT error; + UINT error = 0; if (!context) return ERROR_INVALID_PARAMETER; @@ -1000,8 +1000,8 @@ UINT rail_order_recv(LPVOID userdata, wStream* s) { char buffer[128] = { 0 }; railPlugin* rail = userdata; - UINT16 orderType; - UINT16 orderLength; + UINT16 orderType = 0; + UINT16 orderLength = 0; UINT error = CHANNEL_RC_OK; if (!rail || !s) @@ -1107,8 +1107,8 @@ UINT rail_order_recv(LPVOID userdata, wStream* s) */ UINT rail_send_handshake_order(railPlugin* rail, const RAIL_HANDSHAKE_ORDER* handshake) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail || !handshake) return ERROR_INVALID_PARAMETER; @@ -1134,8 +1134,8 @@ UINT rail_send_handshake_order(railPlugin* rail, const RAIL_HANDSHAKE_ORDER* han */ UINT rail_send_handshake_ex_order(railPlugin* rail, const RAIL_HANDSHAKE_EX_ORDER* handshakeEx) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail || !handshakeEx) return ERROR_INVALID_PARAMETER; @@ -1161,8 +1161,8 @@ UINT rail_send_handshake_ex_order(railPlugin* rail, const RAIL_HANDSHAKE_EX_ORDE */ UINT rail_send_client_status_order(railPlugin* rail, const RAIL_CLIENT_STATUS_ORDER* clientStatus) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail || !clientStatus) return ERROR_INVALID_PARAMETER; @@ -1195,9 +1195,9 @@ UINT rail_send_client_exec_order(railPlugin* rail, UINT16 flags, const RAIL_UNICODE_STRING* workingDir, const RAIL_UNICODE_STRING* arguments) { - wStream* s; - UINT error; - size_t length; + wStream* s = NULL; + UINT error = 0; + size_t length = 0; if (!rail || !exeOrFile || !workingDir || !arguments) return ERROR_INVALID_PARAMETER; @@ -1235,8 +1235,8 @@ out: */ UINT rail_send_client_activate_order(railPlugin* rail, const RAIL_ACTIVATE_ORDER* activate) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail || !activate) return ERROR_INVALID_PARAMETER; @@ -1265,8 +1265,8 @@ UINT rail_send_client_activate_order(railPlugin* rail, const RAIL_ACTIVATE_ORDER */ UINT rail_send_client_sysmenu_order(railPlugin* rail, const RAIL_SYSMENU_ORDER* sysmenu) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail || !sysmenu) return ERROR_INVALID_PARAMETER; @@ -1295,8 +1295,8 @@ UINT rail_send_client_sysmenu_order(railPlugin* rail, const RAIL_SYSMENU_ORDER* */ UINT rail_send_client_syscommand_order(railPlugin* rail, const RAIL_SYSCOMMAND_ORDER* syscommand) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail || !syscommand) return ERROR_INVALID_PARAMETER; @@ -1326,8 +1326,8 @@ UINT rail_send_client_syscommand_order(railPlugin* rail, const RAIL_SYSCOMMAND_O UINT rail_send_client_notify_event_order(railPlugin* rail, const RAIL_NOTIFY_EVENT_ORDER* notifyEvent) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail || !notifyEvent) return ERROR_INVALID_PARAMETER; @@ -1356,8 +1356,8 @@ UINT rail_send_client_notify_event_order(railPlugin* rail, */ UINT rail_send_client_window_move_order(railPlugin* rail, const RAIL_WINDOW_MOVE_ORDER* windowMove) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail || !windowMove) return ERROR_INVALID_PARAMETER; @@ -1387,8 +1387,8 @@ UINT rail_send_client_window_move_order(railPlugin* rail, const RAIL_WINDOW_MOVE UINT rail_send_client_get_appid_req_order(railPlugin* rail, const RAIL_GET_APPID_REQ_ORDER* getAppIdReq) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail || !getAppIdReq) return ERROR_INVALID_PARAMETER; @@ -1418,8 +1418,8 @@ UINT rail_send_client_get_appid_req_order(railPlugin* rail, UINT rail_send_client_langbar_info_order(railPlugin* rail, const RAIL_LANGBAR_INFO_ORDER* langBarInfo) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail || !langBarInfo) return ERROR_INVALID_PARAMETER; @@ -1447,8 +1447,8 @@ UINT rail_send_client_langbar_info_order(railPlugin* rail, UINT rail_send_client_languageime_info_order(railPlugin* rail, const RAIL_LANGUAGEIME_INFO_ORDER* langImeInfo) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail || !langImeInfo) return ERROR_INVALID_PARAMETER; @@ -1476,8 +1476,8 @@ UINT rail_send_client_languageime_info_order(railPlugin* rail, UINT rail_send_client_compartment_info_order(railPlugin* rail, const RAIL_COMPARTMENT_INFO_ORDER* compartmentInfo) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail || !compartmentInfo) return ERROR_INVALID_PARAMETER; @@ -1504,8 +1504,8 @@ UINT rail_send_client_compartment_info_order(railPlugin* rail, UINT rail_send_client_cloak_order(railPlugin* rail, const RAIL_CLOAK* cloak) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail || !cloak) return ERROR_INVALID_PARAMETER; @@ -1527,8 +1527,8 @@ UINT rail_send_client_cloak_order(railPlugin* rail, const RAIL_CLOAK* cloak) UINT rail_send_client_snap_arrange_order(railPlugin* rail, const RAIL_SNAP_ARRANGE* snap) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!rail) return ERROR_INVALID_PARAMETER; diff --git a/channels/rail/rail_common.c b/channels/rail/rail_common.c index 55fa30231..fb6bc80ca 100644 --- a/channels/rail/rail_common.c +++ b/channels/rail/rail_common.c @@ -121,7 +121,7 @@ void rail_write_pdu_header(wStream* s, UINT16 orderType, UINT16 orderLength) wStream* rail_pdu_init(size_t length) { - wStream* s; + wStream* s = NULL; s = Stream_New(NULL, length + RAIL_PDU_HEADER_LENGTH); if (!s) @@ -199,7 +199,7 @@ UINT rail_write_unicode_string(wStream* s, const RAIL_UNICODE_STRING* unicode_st */ UINT rail_write_unicode_string_value(wStream* s, const RAIL_UNICODE_STRING* unicode_string) { - size_t length; + size_t length = 0; if (!s || !unicode_string) return ERROR_INVALID_PARAMETER; @@ -248,7 +248,7 @@ static UINT rail_read_high_contrast(wStream* s, RAIL_HIGH_CONTRAST* highContrast */ static UINT rail_write_high_contrast(wStream* s, const RAIL_HIGH_CONTRAST* highContrast) { - UINT32 colorSchemeLength; + UINT32 colorSchemeLength = 0; if (!s || !highContrast) return ERROR_INVALID_PARAMETER; @@ -311,7 +311,7 @@ static UINT rail_write_filterkeys(wStream* s, const TS_FILTERKEYS* filterKeys) */ UINT rail_read_sysparam_order(wStream* s, RAIL_SYSPARAM_ORDER* sysparam, BOOL extendedSpiSupported) { - BYTE body; + BYTE body = 0; UINT error = CHANNEL_RC_OK; if (!s || !sysparam) @@ -477,7 +477,7 @@ UINT rail_read_sysparam_order(wStream* s, RAIL_SYSPARAM_ORDER* sysparam, BOOL ex UINT rail_write_sysparam_order(wStream* s, const RAIL_SYSPARAM_ORDER* sysparam, BOOL extendedSpiSupported) { - BYTE body; + BYTE body = 0; UINT error = CHANNEL_RC_OK; if (!s || !sysparam) diff --git a/channels/rail/server/rail_main.c b/channels/rail/server/rail_main.c index 85aba168c..8e38c2bc8 100644 --- a/channels/rail/server/rail_main.c +++ b/channels/rail/server/rail_main.c @@ -41,7 +41,7 @@ static UINT rail_send(RailServerContext* context, wStream* s, ULONG length) { UINT status = CHANNEL_RC_OK; - ULONG written; + ULONG written = 0; if (!context) return CHANNEL_RC_BAD_INIT_HANDLE; @@ -64,7 +64,7 @@ static UINT rail_send(RailServerContext* context, wStream* s, ULONG length) static UINT rail_server_send_pdu(RailServerContext* context, wStream* s, UINT16 orderType) { char buffer[128] = { 0 }; - UINT16 orderLength; + UINT16 orderLength = 0; if (!context || !s) return ERROR_INVALID_PARAMETER; @@ -265,8 +265,8 @@ static UINT rail_write_get_appid_resp_ex_order(wStream* s, static UINT rail_send_server_handshake(RailServerContext* context, const RAIL_HANDSHAKE_ORDER* handshake) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!context || !handshake) return ERROR_INVALID_PARAMETER; @@ -293,8 +293,8 @@ static UINT rail_send_server_handshake(RailServerContext* context, static UINT rail_send_server_handshake_ex(RailServerContext* context, const RAIL_HANDSHAKE_EX_ORDER* handshakeEx) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!context || !handshakeEx || !context->priv) return ERROR_INVALID_PARAMETER; @@ -323,10 +323,10 @@ static UINT rail_send_server_handshake_ex(RailServerContext* context, static UINT rail_send_server_sysparam(RailServerContext* context, const RAIL_SYSPARAM_ORDER* sysparam) { - wStream* s; - UINT error; - RailServerPrivate* priv; - BOOL extendedSpiSupported; + wStream* s = NULL; + UINT error = 0; + RailServerPrivate* priv = NULL; + BOOL extendedSpiSupported = 0; if (!context || !sysparam) return ERROR_INVALID_PARAMETER; @@ -359,8 +359,8 @@ static UINT rail_send_server_sysparam(RailServerContext* context, static UINT rail_send_server_local_move_size(RailServerContext* context, const RAIL_LOCALMOVESIZE_ORDER* localMoveSize) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!context || !localMoveSize) return ERROR_INVALID_PARAMETER; @@ -387,8 +387,8 @@ static UINT rail_send_server_local_move_size(RailServerContext* context, static UINT rail_send_server_min_max_info(RailServerContext* context, const RAIL_MINMAXINFO_ORDER* minMaxInfo) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!context || !minMaxInfo) return ERROR_INVALID_PARAMETER; @@ -415,8 +415,8 @@ static UINT rail_send_server_min_max_info(RailServerContext* context, static UINT rail_send_server_taskbar_info(RailServerContext* context, const RAIL_TASKBAR_INFO_ORDER* taskbarInfo) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!context || !taskbarInfo) return ERROR_INVALID_PARAMETER; @@ -443,8 +443,8 @@ static UINT rail_send_server_taskbar_info(RailServerContext* context, static UINT rail_send_server_langbar_info(RailServerContext* context, const RAIL_LANGBAR_INFO_ORDER* langbarInfo) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!context || !langbarInfo) return ERROR_INVALID_PARAMETER; @@ -471,8 +471,8 @@ static UINT rail_send_server_langbar_info(RailServerContext* context, static UINT rail_send_server_exec_result(RailServerContext* context, const RAIL_EXEC_RESULT_ORDER* execResult) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!context || !execResult) return ERROR_INVALID_PARAMETER; @@ -499,8 +499,8 @@ static UINT rail_send_server_exec_result(RailServerContext* context, static UINT rail_send_server_z_order_sync(RailServerContext* context, const RAIL_ZORDER_SYNC* zOrderSync) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!context || !zOrderSync) return ERROR_INVALID_PARAMETER; @@ -526,8 +526,8 @@ static UINT rail_send_server_z_order_sync(RailServerContext* context, */ static UINT rail_send_server_cloak(RailServerContext* context, const RAIL_CLOAK* cloak) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!context || !cloak) return ERROR_INVALID_PARAMETER; @@ -555,8 +555,8 @@ static UINT rail_send_server_power_display_request(RailServerContext* context, const RAIL_POWER_DISPLAY_REQUEST* powerDisplayRequest) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!context || !powerDisplayRequest) return ERROR_INVALID_PARAMETER; @@ -583,8 +583,8 @@ rail_send_server_power_display_request(RailServerContext* context, static UINT rail_send_server_get_app_id_resp(RailServerContext* context, const RAIL_GET_APPID_RESP_ORDER* getAppidResp) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!context || !getAppidResp) return ERROR_INVALID_PARAMETER; @@ -611,8 +611,8 @@ static UINT rail_send_server_get_app_id_resp(RailServerContext* context, static UINT rail_send_server_get_appid_resp_ex(RailServerContext* context, const RAIL_GET_APPID_RESP_EX* getAppidRespEx) { - wStream* s; - UINT error; + wStream* s = NULL; + UINT error = 0; if (!context || !getAppidRespEx) return ERROR_INVALID_PARAMETER; @@ -653,9 +653,9 @@ static UINT rail_read_client_status_order(wStream* s, RAIL_CLIENT_STATUS_ORDER* static UINT rail_read_exec_order(wStream* s, RAIL_EXEC_ORDER* exec) { RAIL_EXEC_ORDER order = { 0 }; - UINT16 exeLen; - UINT16 workLen; - UINT16 argLen; + UINT16 exeLen = 0; + UINT16 workLen = 0; + UINT16 argLen = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, RAIL_EXEC_ORDER_LENGTH)) return ERROR_INVALID_DATA; @@ -706,7 +706,7 @@ fail: */ static UINT rail_read_activate_order(wStream* s, RAIL_ACTIVATE_ORDER* activate) { - BYTE enabled; + BYTE enabled = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, RAIL_ACTIVATE_ORDER_LENGTH)) return ERROR_INVALID_DATA; @@ -875,7 +875,7 @@ static UINT rail_read_compartment_info_order(wStream* s, */ static UINT rail_read_cloak_order(wStream* s, RAIL_CLOAK* cloak) { - BYTE cloaked; + BYTE cloaked = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, RAIL_CLOAK_ORDER_LENGTH)) return ERROR_INVALID_DATA; @@ -894,7 +894,7 @@ static UINT rail_read_cloak_order(wStream* s, RAIL_CLOAK* cloak) static UINT rail_recv_client_handshake_order(RailServerContext* context, RAIL_HANDSHAKE_ORDER* handshake, wStream* s) { - UINT error; + UINT error = 0; if (!context || !handshake || !s) return ERROR_INVALID_PARAMETER; @@ -921,7 +921,7 @@ static UINT rail_recv_client_handshake_order(RailServerContext* context, static UINT rail_recv_client_client_status_order(RailServerContext* context, RAIL_CLIENT_STATUS_ORDER* clientStatus, wStream* s) { - UINT error; + UINT error = 0; if (!context || !clientStatus || !s) return ERROR_INVALID_PARAMETER; @@ -947,7 +947,7 @@ static UINT rail_recv_client_client_status_order(RailServerContext* context, */ static UINT rail_recv_client_exec_order(RailServerContext* context, wStream* s) { - UINT error; + UINT error = 0; RAIL_EXEC_ORDER exec = { 0 }; if (!context || !s) @@ -978,8 +978,8 @@ static UINT rail_recv_client_exec_order(RailServerContext* context, wStream* s) static UINT rail_recv_client_sysparam_order(RailServerContext* context, RAIL_SYSPARAM_ORDER* sysparam, wStream* s) { - UINT error; - BOOL extendedSpiSupported; + UINT error = 0; + BOOL extendedSpiSupported = 0; if (!context || !sysparam || !s) return ERROR_INVALID_PARAMETER; @@ -1007,7 +1007,7 @@ static UINT rail_recv_client_sysparam_order(RailServerContext* context, static UINT rail_recv_client_activate_order(RailServerContext* context, RAIL_ACTIVATE_ORDER* activate, wStream* s) { - UINT error; + UINT error = 0; if (!context || !activate || !s) return ERROR_INVALID_PARAMETER; @@ -1034,7 +1034,7 @@ static UINT rail_recv_client_activate_order(RailServerContext* context, static UINT rail_recv_client_sysmenu_order(RailServerContext* context, RAIL_SYSMENU_ORDER* sysmenu, wStream* s) { - UINT error; + UINT error = 0; if (!context || !sysmenu || !s) return ERROR_INVALID_PARAMETER; @@ -1061,7 +1061,7 @@ static UINT rail_recv_client_sysmenu_order(RailServerContext* context, RAIL_SYSM static UINT rail_recv_client_syscommand_order(RailServerContext* context, RAIL_SYSCOMMAND_ORDER* syscommand, wStream* s) { - UINT error; + UINT error = 0; if (!context || !syscommand || !s) return ERROR_INVALID_PARAMETER; @@ -1088,7 +1088,7 @@ static UINT rail_recv_client_syscommand_order(RailServerContext* context, static UINT rail_recv_client_notify_event_order(RailServerContext* context, RAIL_NOTIFY_EVENT_ORDER* notifyEvent, wStream* s) { - UINT error; + UINT error = 0; if (!context || !notifyEvent || !s) return ERROR_INVALID_PARAMETER; @@ -1115,7 +1115,7 @@ static UINT rail_recv_client_notify_event_order(RailServerContext* context, static UINT rail_recv_client_window_move_order(RailServerContext* context, RAIL_WINDOW_MOVE_ORDER* windowMove, wStream* s) { - UINT error; + UINT error = 0; if (!context || !windowMove || !s) return ERROR_INVALID_PARAMETER; @@ -1142,7 +1142,7 @@ static UINT rail_recv_client_window_move_order(RailServerContext* context, static UINT rail_recv_client_snap_arrange_order(RailServerContext* context, RAIL_SNAP_ARRANGE* snapArrange, wStream* s) { - UINT error; + UINT error = 0; if (!context || !snapArrange || !s) return ERROR_INVALID_PARAMETER; @@ -1169,7 +1169,7 @@ static UINT rail_recv_client_snap_arrange_order(RailServerContext* context, static UINT rail_recv_client_get_appid_req_order(RailServerContext* context, RAIL_GET_APPID_REQ_ORDER* getAppidReq, wStream* s) { - UINT error; + UINT error = 0; if (!context || !getAppidReq || !s) return ERROR_INVALID_PARAMETER; @@ -1196,7 +1196,7 @@ static UINT rail_recv_client_get_appid_req_order(RailServerContext* context, static UINT rail_recv_client_langbar_info_order(RailServerContext* context, RAIL_LANGBAR_INFO_ORDER* langbarInfo, wStream* s) { - UINT error; + UINT error = 0; if (!context || !langbarInfo || !s) return ERROR_INVALID_PARAMETER; @@ -1224,7 +1224,7 @@ static UINT rail_recv_client_language_ime_info_order(RailServerContext* context, RAIL_LANGUAGEIME_INFO_ORDER* languageImeInfo, wStream* s) { - UINT error; + UINT error = 0; if (!context || !languageImeInfo || !s) return ERROR_INVALID_PARAMETER; @@ -1252,7 +1252,7 @@ static UINT rail_recv_client_compartment_info(RailServerContext* context, RAIL_COMPARTMENT_INFO_ORDER* compartmentInfo, wStream* s) { - UINT error; + UINT error = 0; if (!context || !compartmentInfo || !s) return ERROR_INVALID_PARAMETER; @@ -1278,7 +1278,7 @@ static UINT rail_recv_client_compartment_info(RailServerContext* context, */ static UINT rail_recv_client_cloak_order(RailServerContext* context, RAIL_CLOAK* cloak, wStream* s) { - UINT error; + UINT error = 0; if (!context || !cloak || !s) return ERROR_INVALID_PARAMETER; @@ -1300,7 +1300,7 @@ static UINT rail_recv_client_cloak_order(RailServerContext* context, RAIL_CLOAK* static UINT rail_recv_client_text_scale_order(RailServerContext* context, wStream* s) { UINT error = CHANNEL_RC_OK; - UINT32 TextScaleFactor; + UINT32 TextScaleFactor = 0; if (!context || !s) return ERROR_INVALID_PARAMETER; @@ -1320,7 +1320,7 @@ static UINT rail_recv_client_text_scale_order(RailServerContext* context, wStrea static UINT rail_recv_client_caret_blink(RailServerContext* context, wStream* s) { UINT error = CHANNEL_RC_OK; - UINT32 CaretBlinkRate; + UINT32 CaretBlinkRate = 0; if (!context || !s) return ERROR_INVALID_PARAMETER; @@ -1341,7 +1341,7 @@ static DWORD WINAPI rail_server_thread(LPVOID arg) { RailServerContext* context = (RailServerContext*)arg; RailServerPrivate* priv = context->priv; - DWORD status; + DWORD status = 0; DWORD nCount = 0; HANDLE events[8]; UINT error = CHANNEL_RC_OK; @@ -1409,7 +1409,7 @@ static DWORD WINAPI rail_server_thread(LPVOID arg) static UINT rail_server_start(RailServerContext* context) { void* buffer = NULL; - DWORD bytesReturned; + DWORD bytesReturned = 0; RailServerPrivate* priv = context->priv; UINT error = ERROR_INTERNAL_ERROR; priv->rail_channel = @@ -1496,8 +1496,8 @@ static BOOL rail_server_stop(RailServerContext* context) RailServerContext* rail_server_context_new(HANDLE vcm) { - RailServerContext* context; - RailServerPrivate* priv; + RailServerContext* context = NULL; + RailServerPrivate* priv = NULL; context = (RailServerContext*)calloc(1, sizeof(RailServerContext)); if (!context) @@ -1558,7 +1558,7 @@ void rail_server_context_free(RailServerContext* context) void rail_server_set_handshake_ex_flags(RailServerContext* context, DWORD flags) { - RailServerPrivate* priv; + RailServerPrivate* priv = NULL; if (!context || !context->priv) return; @@ -1571,9 +1571,9 @@ UINT rail_server_handle_messages(RailServerContext* context) { char buffer[128] = { 0 }; UINT status = CHANNEL_RC_OK; - DWORD bytesReturned; - UINT16 orderType; - UINT16 orderLength; + DWORD bytesReturned = 0; + UINT16 orderType = 0; + UINT16 orderLength = 0; RailServerPrivate* priv = context->priv; wStream* s = priv->input_stream; diff --git a/channels/rdp2tcp/client/rdp2tcp_main.c b/channels/rdp2tcp/client/rdp2tcp_main.c index 3779a4774..ef32196de 100644 --- a/channels/rdp2tcp/client/rdp2tcp_main.c +++ b/channels/rdp2tcp/client/rdp2tcp_main.c @@ -113,7 +113,7 @@ static void dumpData(char* data, unsigned length) { unsigned const limit = 98; unsigned l = length > limit ? limit / 2 : length; - unsigned i; + unsigned i = 0; for (i = 0; i < l; ++i) { @@ -141,7 +141,7 @@ static DWORD WINAPI copyThread(void* data) { HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 }; - DWORD dwRead; + DWORD dwRead = 0; char* buffer = malloc(bufsize); if (!buffer) @@ -197,7 +197,7 @@ static void closeChannel(Plugin* plugin) static void dataReceived(Plugin* plugin, void* pData, UINT32 dataLength, UINT32 totalLength, UINT32 dataFlags) { - DWORD dwWritten; + DWORD dwWritten = 0; if (dataFlags & CHANNEL_FLAG_SUSPEND) { @@ -324,7 +324,7 @@ static VOID VCAPITYPE VirtualChannelInitEventEx(LPVOID lpUserParam, LPVOID pInit FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, PVOID pInitHandle)) { - CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx; + CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = NULL; CHANNEL_DEF channelDef; Plugin* plugin = (Plugin*)calloc(1, sizeof(Plugin)); diff --git a/channels/rdpdr/client/devman.c b/channels/rdpdr/client/devman.c index b40cd6172..7c9e3ff61 100644 --- a/channels/rdpdr/client/devman.c +++ b/channels/rdpdr/client/devman.c @@ -53,7 +53,7 @@ static void devman_device_free(void* obj) DEVMAN* devman_new(rdpdrPlugin* rdpdr) { - DEVMAN* devman; + DEVMAN* devman = NULL; if (!rdpdr) return NULL; @@ -89,7 +89,7 @@ void devman_free(DEVMAN* devman) void devman_unregister_device(DEVMAN* devman, void* key) { - DEVICE* device; + DEVICE* device = NULL; if (!devman || !key) return; diff --git a/channels/rdpdr/client/irp.c b/channels/rdpdr/client/irp.c index 8da260f11..eeba80d3e 100644 --- a/channels/rdpdr/client/irp.c +++ b/channels/rdpdr/client/irp.c @@ -61,9 +61,9 @@ static UINT irp_free(IRP* irp) */ static UINT irp_complete(IRP* irp) { - size_t pos; - rdpdrPlugin* rdpdr; - UINT error; + size_t pos = 0; + rdpdrPlugin* rdpdr = NULL; + UINT error = 0; WINPR_ASSERT(irp); WINPR_ASSERT(irp->output); @@ -86,9 +86,9 @@ static UINT irp_complete(IRP* irp) IRP* irp_new(DEVMAN* devman, wStreamPool* pool, wStream* s, wLog* log, UINT* error) { - IRP* irp; - DEVICE* device; - UINT32 DeviceId; + IRP* irp = NULL; + DEVICE* device = NULL; + UINT32 DeviceId = 0; WINPR_ASSERT(devman); WINPR_ASSERT(pool); diff --git a/channels/rdpdr/client/rdpdr_capabilities.c b/channels/rdpdr/client/rdpdr_capabilities.c index 0c5331be5..fd222fabc 100644 --- a/channels/rdpdr/client/rdpdr_capabilities.c +++ b/channels/rdpdr/client/rdpdr_capabilities.c @@ -173,8 +173,8 @@ static UINT rdpdr_process_smartcard_capset(rdpdrPlugin* rdpdr, wStream* s, UINT rdpdr_process_capability_request(rdpdrPlugin* rdpdr, wStream* s) { UINT status = CHANNEL_RC_OK; - UINT16 i; - UINT16 numCapabilities; + UINT16 i = 0; + UINT16 numCapabilities = 0; if (!rdpdr || !s) return CHANNEL_RC_NULL_DATA; @@ -236,7 +236,7 @@ UINT rdpdr_process_capability_request(rdpdrPlugin* rdpdr, wStream* s) */ UINT rdpdr_send_capability_response(rdpdrPlugin* rdpdr) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(rdpdr); s = StreamPool_Take(rdpdr->pool, 256); diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c index 3e58b1145..857e236a6 100644 --- a/channels/rdpdr/client/rdpdr_main.c +++ b/channels/rdpdr/client/rdpdr_main.c @@ -231,8 +231,8 @@ fail: */ static UINT rdpdr_send_device_list_remove_request(rdpdrPlugin* rdpdr, UINT32 count, UINT32 ids[]) { - UINT32 i; - wStream* s; + UINT32 i = 0; + wStream* s = NULL; WINPR_ASSERT(rdpdr); WINPR_ASSERT(ids || (count == 0)); @@ -724,7 +724,7 @@ static const char* automountLocations[] = { "/run/user/%lu/gvfs", "/run/media/%s static BOOL isAutomountLocation(const char* path) { const size_t nrLocations = sizeof(automountLocations) / sizeof(automountLocations[0]); - size_t x; + size_t x = 0; char buffer[MAX_PATH] = { 0 }; uid_t uid = getuid(); char uname[MAX_PATH] = { 0 }; @@ -739,7 +739,7 @@ static BOOL isAutomountLocation(const char* path) for (x = 0; x < nrLocations; x++) { const char* location = automountLocations[x]; - size_t length; + size_t length = 0; if (strstr(location, "%lu")) snprintf(buffer, sizeof(buffer), location, (unsigned long)uid); @@ -841,8 +841,8 @@ static UINT handle_platform_mounts_bsd(wLog* log, hotplug_dev* dev_array, size_t #include static UINT handle_platform_mounts_linux(wLog* log, hotplug_dev* dev_array, size_t* size) { - FILE* f; - struct mntent* ent; + FILE* f = NULL; + struct mntent* ent = NULL; f = winpr_fopen("/proc/mounts", "r"); if (f == NULL) { @@ -937,7 +937,7 @@ static BOOL hotplug_delete_foreach(ULONG_PTR key, void* element, void* data) /* not plugable device */ if (isAutomountLocation(path)) { - size_t i; + size_t i = 0; for (i = 0; i < arg->dev_array_size; i++) { hotplug_dev* cur = &arg->dev_array[i]; @@ -954,7 +954,7 @@ static BOOL hotplug_delete_foreach(ULONG_PTR key, void* element, void* data) if (!dev_found) { - UINT error; + UINT error = 0; UINT32 ids[1] = { key }; WINPR_ASSERT(arg->rdpdr->devman); @@ -977,7 +977,7 @@ static BOOL hotplug_delete_foreach(ULONG_PTR key, void* element, void* data) static UINT handle_hotplug(rdpdrPlugin* rdpdr) { hotplug_dev dev_array[MAX_USB_DEVICES] = { 0 }; - size_t i; + size_t i = 0; size_t size = 0; UINT error = ERROR_SUCCESS; struct hotplug_delete_arg arg = { dev_array, ARRAYSIZE(dev_array), rdpdr }; @@ -1012,7 +1012,7 @@ static UINT handle_hotplug(rdpdrPlugin* rdpdr) static void first_hotplug(rdpdrPlugin* rdpdr) { - UINT error; + UINT error = 0; WINPR_ASSERT(rdpdr); if ((error = handle_hotplug(rdpdr))) @@ -1034,7 +1034,7 @@ static void first_hotplug(rdpdrPlugin* rdpdr) static DWORD WINAPI drive_hotplug_thread_func(LPVOID arg) { - rdpdrPlugin* rdpdr; + rdpdrPlugin* rdpdr = NULL; UINT error = 0; rdpdr = (rdpdrPlugin*)arg; @@ -1089,7 +1089,7 @@ out: */ static UINT drive_hotplug_thread_terminate(rdpdrPlugin* rdpdr) { - UINT error; + UINT error = 0; WINPR_ASSERT(rdpdr); @@ -1235,7 +1235,7 @@ static UINT rdpdr_process_server_announce_request(rdpdrPlugin* rdpdr, wStream* s */ static UINT rdpdr_send_client_announce_reply(rdpdrPlugin* rdpdr) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(rdpdr); WINPR_ASSERT(rdpdr->state == RDPDR_CHANNEL_STATE_ANNOUNCE); @@ -1264,9 +1264,9 @@ static UINT rdpdr_send_client_announce_reply(rdpdrPlugin* rdpdr) */ static UINT rdpdr_send_client_name_request(rdpdrPlugin* rdpdr) { - wStream* s; + wStream* s = NULL; WCHAR* computerNameW = NULL; - size_t computerNameLenW; + size_t computerNameLenW = 0; WINPR_ASSERT(rdpdr); WINPR_ASSERT(rdpdr->state == RDPDR_CHANNEL_STATE_ANNOUNCE_REPLY); @@ -1308,9 +1308,9 @@ static UINT rdpdr_send_client_name_request(rdpdrPlugin* rdpdr) static UINT rdpdr_process_server_clientid_confirm(rdpdrPlugin* rdpdr, wStream* s) { - UINT16 versionMajor; - UINT16 versionMinor; - UINT32 clientID; + UINT16 versionMajor = 0; + UINT16 versionMinor = 0; + UINT32 clientID = 0; WINPR_ASSERT(rdpdr); WINPR_ASSERT(s); @@ -1350,7 +1350,7 @@ struct device_announce_arg static BOOL device_announce(ULONG_PTR key, void* element, void* data) { struct device_announce_arg* arg = data; - rdpdrPlugin* rdpdr; + rdpdrPlugin* rdpdr = NULL; DEVICE* device = (DEVICE*)element; WINPR_UNUSED(key); @@ -1372,7 +1372,7 @@ static BOOL device_announce(ULONG_PTR key, void* element, void* data) if ((rdpdr->clientVersionMinor == RDPDR_VERSION_MINOR_RDP51) || (device->type == RDPDR_DTYP_SMARTCARD) || arg->userLoggedOn) { - size_t i; + size_t i = 0; size_t data_len = (device->data == NULL ? 0 : Stream_GetPosition(device->data)); if (!Stream_EnsureRemainingCapacity(arg->s, 20 + data_len)) @@ -1388,7 +1388,7 @@ static BOOL device_announce(ULONG_PTR key, void* element, void* data) for (i = 0; i < 8; i++) { - BYTE c; + BYTE c = 0; Stream_Peek_UINT8(arg->s, c); if (c > 0x7F) @@ -1414,9 +1414,9 @@ static BOOL device_announce(ULONG_PTR key, void* element, void* data) static UINT rdpdr_send_device_list_announce_request(rdpdrPlugin* rdpdr, BOOL userLoggedOn) { - size_t pos; - wStream* s; - size_t count_pos; + size_t pos = 0; + wStream* s = NULL; + size_t count_pos = 0; struct device_announce_arg arg = { 0 }; WINPR_ASSERT(rdpdr); @@ -1474,10 +1474,10 @@ UINT rdpdr_try_send_device_list_announce_request(rdpdrPlugin* rdpdr) static UINT dummy_irp_response(rdpdrPlugin* rdpdr, wStream* s) { - wStream* output; - UINT32 DeviceId; - UINT32 FileId; - UINT32 CompletionId; + wStream* output = NULL; + UINT32 DeviceId = 0; + UINT32 FileId = 0; + UINT32 CompletionId = 0; WINPR_ASSERT(rdpdr); WINPR_ASSERT(s); @@ -1509,7 +1509,7 @@ static UINT dummy_irp_response(rdpdrPlugin* rdpdr, wStream* s) */ static UINT rdpdr_process_irp(rdpdrPlugin* rdpdr, wStream* s) { - IRP* irp; + IRP* irp = NULL; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(rdpdr); @@ -1547,8 +1547,8 @@ static UINT rdpdr_process_irp(rdpdrPlugin* rdpdr, wStream* s) static UINT rdpdr_process_component(rdpdrPlugin* rdpdr, UINT16 component, UINT16 packetId, wStream* s) { - UINT32 type; - DEVICE* device; + UINT32 type = 0; + DEVICE* device = NULL; WINPR_ASSERT(rdpdr); WINPR_ASSERT(s); @@ -1705,10 +1705,10 @@ static BOOL rdpdr_check_channel_state(rdpdrPlugin* rdpdr, UINT16 packetid) */ static UINT rdpdr_process_receive(rdpdrPlugin* rdpdr, wStream* s) { - UINT16 component; - UINT16 packetId; - UINT32 deviceId; - UINT32 status; + UINT16 component = 0; + UINT16 packetId = 0; + UINT32 deviceId = 0; + UINT32 status = 0; UINT error = ERROR_INVALID_DATA; if (!rdpdr || !s) @@ -1864,7 +1864,7 @@ static UINT rdpdr_process_receive(rdpdrPlugin* rdpdr, wStream* s) */ UINT rdpdr_send(rdpdrPlugin* rdpdr, wStream* s) { - UINT status; + UINT status = 0; rdpdrPlugin* plugin = (rdpdrPlugin*)rdpdr; if (!rdpdr || !s) @@ -1905,7 +1905,7 @@ static UINT rdpdr_virtual_channel_event_data_received(rdpdrPlugin* rdpdr, void* UINT32 dataLength, UINT32 totalLength, UINT32 dataFlags) { - wStream* data_in; + wStream* data_in = NULL; WINPR_ASSERT(rdpdr); WINPR_ASSERT(pData || (dataLength == 0)); @@ -2029,7 +2029,7 @@ static VOID VCAPITYPE rdpdr_virtual_channel_open_event_ex(LPVOID lpUserParam, DW static DWORD WINAPI rdpdr_virtual_channel_client_thread(LPVOID arg) { rdpdrPlugin* rdpdr = (rdpdrPlugin*)arg; - UINT error; + UINT error = 0; if (!rdpdr) { @@ -2096,7 +2096,7 @@ fail: static void queue_free(void* obj) { - wStream* s; + wStream* s = NULL; wMessage* msg = (wMessage*)obj; if (!msg || (msg->id != 0)) @@ -2115,7 +2115,7 @@ static void queue_free(void* obj) static UINT rdpdr_virtual_channel_event_connected(rdpdrPlugin* rdpdr, LPVOID pData, UINT32 dataLength) { - wObject* obj; + wObject* obj = NULL; WINPR_ASSERT(rdpdr); WINPR_UNUSED(pData); @@ -2164,7 +2164,7 @@ static UINT rdpdr_virtual_channel_event_connected(rdpdrPlugin* rdpdr, LPVOID pDa */ static UINT rdpdr_virtual_channel_event_disconnected(rdpdrPlugin* rdpdr) { - UINT error; + UINT error = 0; WINPR_ASSERT(rdpdr); @@ -2283,9 +2283,9 @@ static VOID VCAPITYPE rdpdr_virtual_channel_init_event_ex(LPVOID lpUserParam, LP FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, PVOID pInitHandle)) { - UINT rc; - rdpdrPlugin* rdpdr; - CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx; + UINT rc = 0; + rdpdrPlugin* rdpdr = NULL; + CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = NULL; WINPR_ASSERT(pEntryPoints); WINPR_ASSERT(pInitHandle); diff --git a/channels/rdpdr/server/rdpdr_main.c b/channels/rdpdr/server/rdpdr_main.c index 456974c0a..cc2e9a04d 100644 --- a/channels/rdpdr/server/rdpdr_main.c +++ b/channels/rdpdr/server/rdpdr_main.c @@ -187,7 +187,7 @@ static BOOL rdpdr_server_enqueue_irp(RdpdrServerContext* context, RDPDR_IRP* irp static RDPDR_IRP* rdpdr_server_dequeue_irp(RdpdrServerContext* context, UINT32 completionId) { - RDPDR_IRP* irp; + RDPDR_IRP* irp = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -198,9 +198,9 @@ static RDPDR_IRP* rdpdr_server_dequeue_irp(RdpdrServerContext* context, UINT32 c static UINT rdpdr_seal_send_free_request(RdpdrServerContext* context, wStream* s) { - BOOL status; - size_t length; - ULONG written; + BOOL status = 0; + size_t length = 0; + ULONG written = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -236,8 +236,8 @@ static UINT rdpdr_seal_send_free_request(RdpdrServerContext* context, wStream* s */ static UINT rdpdr_server_send_announce_request(RdpdrServerContext* context) { - UINT error; - wStream* s; + UINT error = 0; + wStream* s = NULL; RDPDR_HEADER header = { 0 }; WINPR_ASSERT(context); @@ -274,9 +274,9 @@ static UINT rdpdr_server_send_announce_request(RdpdrServerContext* context) static UINT rdpdr_server_receive_announce_response(RdpdrServerContext* context, wStream* s, const RDPDR_HEADER* header) { - UINT32 ClientId; - UINT16 VersionMajor; - UINT16 VersionMinor; + UINT32 ClientId = 0; + UINT16 VersionMajor = 0; + UINT16 VersionMinor = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WINPR_ASSERT(header); @@ -307,9 +307,9 @@ static UINT rdpdr_server_receive_announce_response(RdpdrServerContext* context, static UINT rdpdr_server_receive_client_name_request(RdpdrServerContext* context, wStream* s, const RDPDR_HEADER* header) { - UINT32 UnicodeFlag; - UINT32 CodePage; - UINT32 ComputerNameLen; + UINT32 UnicodeFlag = 0; + UINT32 CodePage = 0; + UINT32 ComputerNameLen = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -423,12 +423,12 @@ static UINT rdpdr_server_write_capability_set_header_cb(RdpdrServerContext* cont static UINT rdpdr_server_read_general_capability_set(RdpdrServerContext* context, wStream* s, const RDPDR_CAPABILITY_HEADER* header) { - UINT32 ioCode1; - UINT32 extraFlags1; - UINT32 extendedPdu; - UINT16 VersionMajor; - UINT16 VersionMinor; - UINT32 SpecialTypeDeviceCap; + UINT32 ioCode1 = 0; + UINT32 extraFlags1 = 0; + UINT32 extendedPdu = 0; + UINT16 VersionMajor = 0; + UINT16 VersionMinor = 0; + UINT32 SpecialTypeDeviceCap = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WINPR_ASSERT(header); @@ -491,10 +491,10 @@ static UINT rdpdr_server_read_general_capability_set(RdpdrServerContext* context */ static UINT rdpdr_server_write_general_capability_set(RdpdrServerContext* context, wStream* s) { - UINT32 ioCode1; - UINT32 extendedPdu; - UINT32 extraFlags1; - UINT32 SpecialTypeDeviceCap; + UINT32 ioCode1 = 0; + UINT32 extendedPdu = 0; + UINT32 extraFlags1 = 0; + UINT32 SpecialTypeDeviceCap = 0; const RDPDR_CAPABILITY_HEADER header = { CAP_GENERAL_TYPE, RDPDR_CAPABILITY_HEADER_LENGTH + 36, GENERAL_CAPABILITY_VERSION_02 }; @@ -693,10 +693,10 @@ static UINT rdpdr_server_write_smartcard_capability_set(RdpdrServerContext* cont */ static UINT rdpdr_server_send_core_capability_request(RdpdrServerContext* context) { - wStream* s; + wStream* s = NULL; RDPDR_HEADER header = { 0 }; - UINT16 numCapabilities; - UINT error; + UINT16 numCapabilities = 0; + UINT error = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -931,7 +931,7 @@ static UINT rdpdr_server_receive_core_capability_response(RdpdrServerContext* co */ static UINT rdpdr_server_send_client_id_confirm(RdpdrServerContext* context) { - wStream* s; + wStream* s = NULL; RDPDR_HEADER header = { 0 }; WINPR_ASSERT(context); @@ -980,7 +980,7 @@ static UINT rdpdr_server_receive_device_list_announce_request(RdpdrServerContext for (i = 0; i < DeviceCount; i++) { - UINT error; + UINT error = 0; RdpdrDevice device = { 0 }; if (!Stream_CheckAndLogRequiredLengthWLog(context->priv->log, s, 20)) @@ -1080,10 +1080,10 @@ static UINT rdpdr_server_receive_device_list_announce_request(RdpdrServerContext static UINT rdpdr_server_receive_device_list_remove_request(RdpdrServerContext* context, wStream* s, const RDPDR_HEADER* header) { - UINT32 i; - UINT32 DeviceCount; - UINT32 DeviceType; - UINT32 DeviceId; + UINT32 i = 0; + UINT32 DeviceCount = 0; + UINT32 DeviceType = 0; + UINT32 DeviceId = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1097,8 +1097,8 @@ static UINT rdpdr_server_receive_device_list_remove_request(RdpdrServerContext* for (i = 0; i < DeviceCount; i++) { - UINT error; - const RdpdrDevice* device; + UINT error = 0; + const RdpdrDevice* device = NULL; if (!Stream_CheckAndLogRequiredLengthWLog(context->priv->log, s, 4)) return ERROR_INVALID_DATA; @@ -1165,14 +1165,14 @@ static UINT rdpdr_server_receive_io_create_request(RdpdrServerContext* context, UINT32 DeviceId, UINT32 FileId, UINT32 CompletionId) { - const WCHAR* path; - UINT32 DesiredAccess; - UINT32 AllocationSize; - UINT32 FileAttributes; - UINT32 SharedAccess; - UINT32 CreateDisposition; - UINT32 CreateOptions; - UINT32 PathLength; + const WCHAR* path = NULL; + UINT32 DesiredAccess = 0; + UINT32 AllocationSize = 0; + UINT32 FileAttributes = 0; + UINT32 SharedAccess = 0; + UINT32 CreateDisposition = 0; + UINT32 CreateOptions = 0; + UINT32 PathLength = 0; WINPR_ASSERT(context); if (!Stream_CheckAndLogRequiredLengthWLog(context->priv->log, s, 32)) @@ -1220,8 +1220,8 @@ static UINT rdpdr_server_receive_io_read_request(RdpdrServerContext* context, wS UINT32 DeviceId, UINT32 FileId, UINT32 CompletionId) { - UINT32 Length; - UINT64 Offset; + UINT32 Length = 0; + UINT64 Offset = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1243,8 +1243,8 @@ static UINT rdpdr_server_receive_io_write_request(RdpdrServerContext* context, w UINT32 DeviceId, UINT32 FileId, UINT32 CompletionId) { - UINT32 Length; - UINT64 Offset; + UINT32 Length = 0; + UINT64 Offset = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1272,9 +1272,9 @@ static UINT rdpdr_server_receive_io_device_control_request(RdpdrServerContext* c UINT32 DeviceId, UINT32 FileId, UINT32 CompletionId) { - UINT32 OutputBufferLength; - UINT32 InputBufferLength; - UINT32 IoControlCode; + UINT32 OutputBufferLength = 0; + UINT32 InputBufferLength = 0; + UINT32 IoControlCode = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1304,8 +1304,8 @@ static UINT rdpdr_server_receive_io_query_volume_information_request(RdpdrServer UINT32 FileId, UINT32 CompletionId) { - UINT32 FsInformationClass; - UINT32 Length; + UINT32 FsInformationClass = 0; + UINT32 Length = 0; WINPR_ASSERT(context); if (!Stream_CheckAndLogRequiredLengthWLog(context->priv->log, s, 32)) @@ -1333,8 +1333,8 @@ static UINT rdpdr_server_receive_io_set_volume_information_request(RdpdrServerCo UINT32 FileId, UINT32 CompletionId) { - UINT32 FsInformationClass; - UINT32 Length; + UINT32 FsInformationClass = 0; + UINT32 Length = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1363,8 +1363,8 @@ static UINT rdpdr_server_receive_io_query_information_request(RdpdrServerContext wStream* s, UINT32 DeviceId, UINT32 FileId, UINT32 CompletionId) { - UINT32 FsInformationClass; - UINT32 Length; + UINT32 FsInformationClass = 0; + UINT32 Length = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1393,8 +1393,8 @@ static UINT rdpdr_server_receive_io_set_information_request(RdpdrServerContext* UINT32 DeviceId, UINT32 FileId, UINT32 CompletionId) { - UINT32 FsInformationClass; - UINT32 Length; + UINT32 FsInformationClass = 0; + UINT32 Length = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1423,10 +1423,10 @@ static UINT rdpdr_server_receive_io_query_directory_request(RdpdrServerContext* UINT32 DeviceId, UINT32 FileId, UINT32 CompletionId) { - BYTE InitialQuery; - UINT32 FsInformationClass; - UINT32 PathLength; - const WCHAR* Path; + BYTE InitialQuery = 0; + UINT32 FsInformationClass = 0; + UINT32 PathLength = 0; + const WCHAR* Path = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1455,8 +1455,8 @@ static UINT rdpdr_server_receive_io_change_directory_request(RdpdrServerContext* wStream* s, UINT32 DeviceId, UINT32 FileId, UINT32 CompletionId) { - BYTE WatchTree; - UINT32 CompletionFilter; + BYTE WatchTree = 0; + UINT32 CompletionFilter = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1505,9 +1505,9 @@ static UINT rdpdr_server_receive_io_lock_control_request(RdpdrServerContext* con UINT32 DeviceId, UINT32 FileId, UINT32 CompletionId) { - UINT32 Operation; - UINT32 Lock; - UINT32 NumLocks; + UINT32 Operation = 0; + UINT32 Lock = 0; + UINT32 NumLocks = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1524,8 +1524,8 @@ static UINT rdpdr_server_receive_io_lock_control_request(RdpdrServerContext* con for (UINT32 x = 0; x < NumLocks; x++) { - UINT64 Length; - UINT64 Offset; + UINT64 Length = 0; + UINT64 Offset = 0; if (!Stream_CheckAndLogRequiredLengthWLog(context->priv->log, s, 16)) return ERROR_INVALID_DATA; @@ -1545,11 +1545,11 @@ static UINT rdpdr_server_receive_io_lock_control_request(RdpdrServerContext* con static UINT rdpdr_server_receive_device_io_request(RdpdrServerContext* context, wStream* s, const RDPDR_HEADER* header) { - UINT32 DeviceId; - UINT32 FileId; - UINT32 CompletionId; - UINT32 MajorFunction; - UINT32 MinorFunction; + UINT32 DeviceId = 0; + UINT32 FileId = 0; + UINT32 CompletionId = 0; + UINT32 MajorFunction = 0; + UINT32 MinorFunction = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1621,10 +1621,10 @@ static UINT rdpdr_server_receive_device_io_request(RdpdrServerContext* context, static UINT rdpdr_server_receive_device_io_completion(RdpdrServerContext* context, wStream* s, const RDPDR_HEADER* header) { - UINT32 deviceId; - UINT32 completionId; - UINT32 ioStatus; - RDPDR_IRP* irp; + UINT32 deviceId = 0; + UINT32 completionId = 0; + UINT32 ioStatus = 0; + RDPDR_IRP* irp = NULL; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1667,7 +1667,7 @@ static UINT rdpdr_server_receive_device_io_completion(RdpdrServerContext* contex */ static UINT rdpdr_server_send_user_logged_on(RdpdrServerContext* context) { - wStream* s; + wStream* s = NULL; RDPDR_HEADER header = { 0 }; WINPR_ASSERT(context); @@ -1691,13 +1691,13 @@ static UINT rdpdr_server_send_user_logged_on(RdpdrServerContext* context) static UINT rdpdr_server_receive_prn_cache_add_printer(RdpdrServerContext* context, wStream* s) { char PortDosName[9] = { 0 }; - UINT32 PnPNameLen; - UINT32 DriverNameLen; - UINT32 PrinterNameLen; - UINT32 CachedFieldsLen; - const WCHAR* PnPName; - const WCHAR* DriverName; - const WCHAR* PrinterName; + UINT32 PnPNameLen = 0; + UINT32 DriverNameLen = 0; + UINT32 PrinterNameLen = 0; + UINT32 CachedFieldsLen = 0; + const WCHAR* PnPName = NULL; + const WCHAR* DriverName = NULL; + const WCHAR* PrinterName = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1733,9 +1733,9 @@ static UINT rdpdr_server_receive_prn_cache_add_printer(RdpdrServerContext* conte static UINT rdpdr_server_receive_prn_cache_update_printer(RdpdrServerContext* context, wStream* s) { - UINT32 PrinterNameLen; - UINT32 CachedFieldsLen; - const WCHAR* PrinterName; + UINT32 PrinterNameLen = 0; + UINT32 CachedFieldsLen = 0; + const WCHAR* PrinterName = NULL; WINPR_ASSERT(context); @@ -1763,8 +1763,8 @@ static UINT rdpdr_server_receive_prn_cache_update_printer(RdpdrServerContext* co static UINT rdpdr_server_receive_prn_cache_delete_printer(RdpdrServerContext* context, wStream* s) { - UINT32 PrinterNameLen; - const WCHAR* PrinterName; + UINT32 PrinterNameLen = 0; + const WCHAR* PrinterName = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1787,10 +1787,10 @@ static UINT rdpdr_server_receive_prn_cache_delete_printer(RdpdrServerContext* co static UINT rdpdr_server_receive_prn_cache_rename_cachedata(RdpdrServerContext* context, wStream* s) { - UINT32 OldPrinterNameLen; - UINT32 NewPrinterNameLen; - const WCHAR* OldPrinterName; - const WCHAR* NewPrinterName; + UINT32 OldPrinterNameLen = 0; + UINT32 NewPrinterNameLen = 0; + const WCHAR* OldPrinterName = NULL; + const WCHAR* NewPrinterName = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1818,7 +1818,7 @@ static UINT rdpdr_server_receive_prn_cache_rename_cachedata(RdpdrServerContext* static UINT rdpdr_server_receive_prn_cache_data_request(RdpdrServerContext* context, wStream* s, const RDPDR_HEADER* header) { - UINT32 EventId; + UINT32 EventId = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1848,8 +1848,8 @@ static UINT rdpdr_server_receive_prn_cache_data_request(RdpdrServerContext* cont static UINT rdpdr_server_receive_prn_using_xps_request(RdpdrServerContext* context, wStream* s, const RDPDR_HEADER* header) { - UINT32 PrinterId; - UINT32 Flags; + UINT32 PrinterId = 0; + UINT32 Flags = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2001,7 +2001,7 @@ static DWORD WINAPI rdpdr_server_thread(LPVOID arg) HANDLE events[8] = { 0 }; HANDLE ChannelEvent = NULL; DWORD BytesReturned = 0; - UINT error; + UINT error = 0; RdpdrServerContext* context = (RdpdrServerContext*)arg; wStream* s = Stream_New(NULL, 4096); @@ -2037,7 +2037,7 @@ static DWORD WINAPI rdpdr_server_thread(LPVOID arg) while (1) { - size_t capacity; + size_t capacity = 0; BytesReturned = 0; status = WaitForMultipleObjects(nCount, events, FALSE, INFINITE); @@ -2160,7 +2160,7 @@ static UINT rdpdr_server_start(RdpdrServerContext* context) */ static UINT rdpdr_server_stop(RdpdrServerContext* context) { - UINT error; + UINT error = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2211,7 +2211,7 @@ static void rdpdr_server_write_device_iorequest(wStream* s, UINT32 deviceId, UIN static UINT rdpdr_server_read_file_directory_information(wLog* log, wStream* s, FILE_DIRECTORY_INFORMATION* fdi) { - UINT32 fileNameLength; + UINT32 fileNameLength = 0; WINPR_ASSERT(fdi); ZeroMemory(fdi, sizeof(FILE_DIRECTORY_INFORMATION)); @@ -2248,8 +2248,8 @@ static UINT rdpdr_server_send_device_create_request(RdpdrServerContext* context, UINT32 desiredAccess, UINT32 createOptions, UINT32 createDisposition) { - size_t pathLength; - wStream* s; + size_t pathLength = 0; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2293,7 +2293,7 @@ static UINT rdpdr_server_send_device_create_request(RdpdrServerContext* context, static UINT rdpdr_server_send_device_close_request(RdpdrServerContext* context, UINT32 deviceId, UINT32 fileId, UINT32 completionId) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2322,7 +2322,7 @@ static UINT rdpdr_server_send_device_read_request(RdpdrServerContext* context, U UINT32 fileId, UINT32 completionId, UINT32 length, UINT32 offset) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2355,7 +2355,7 @@ static UINT rdpdr_server_send_device_write_request(RdpdrServerContext* context, UINT32 fileId, UINT32 completionId, const char* data, UINT32 length, UINT32 offset) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2389,8 +2389,8 @@ static UINT rdpdr_server_send_device_query_directory_request(RdpdrServerContext* UINT32 deviceId, UINT32 fileId, UINT32 completionId, const char* path) { - size_t pathLength; - wStream* s; + size_t pathLength = 0; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2436,8 +2436,8 @@ static UINT rdpdr_server_send_device_file_rename_request(RdpdrServerContext* con UINT32 deviceId, UINT32 fileId, UINT32 completionId, const char* path) { - size_t pathLength; - wStream* s; + size_t pathLength = 0; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2479,7 +2479,7 @@ static UINT rdpdr_server_send_device_file_rename_request(RdpdrServerContext* con static void rdpdr_server_convert_slashes(char* path, int size) { - int i; + int i = 0; WINPR_ASSERT(path || (size <= 0)); for (i = 0; (i < size) && (path[i] != '\0'); i++) @@ -2528,8 +2528,8 @@ static UINT rdpdr_server_drive_create_directory_callback1(RdpdrServerContext* co RDPDR_IRP* irp, UINT32 deviceId, UINT32 completionId, UINT32 ioStatus) { - UINT32 fileId; - UINT8 information; + UINT32 fileId = 0; + UINT8 information = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WINPR_ASSERT(s); @@ -2578,7 +2578,7 @@ static UINT rdpdr_server_drive_create_directory_callback1(RdpdrServerContext* co static UINT rdpdr_server_drive_create_directory(RdpdrServerContext* context, void* callbackData, UINT32 deviceId, const char* path) { - RDPDR_IRP* irp; + RDPDR_IRP* irp = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WINPR_ASSERT(callbackData); @@ -2649,8 +2649,8 @@ static UINT rdpdr_server_drive_delete_directory_callback1(RdpdrServerContext* co RDPDR_IRP* irp, UINT32 deviceId, UINT32 completionId, UINT32 ioStatus) { - UINT32 fileId; - UINT8 information; + UINT32 fileId = 0; + UINT8 information = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WINPR_ASSERT(irp); @@ -2742,8 +2742,8 @@ static UINT rdpdr_server_drive_query_directory_callback2(RdpdrServerContext* con RDPDR_IRP* irp, UINT32 deviceId, UINT32 completionId, UINT32 ioStatus) { - UINT error; - UINT32 length; + UINT error = 0; + UINT32 length = 0; FILE_DIRECTORY_INFORMATION fdi = { 0 }; WINPR_ASSERT(context); @@ -2818,7 +2818,7 @@ static UINT rdpdr_server_drive_query_directory_callback1(RdpdrServerContext* con RDPDR_IRP* irp, UINT32 deviceId, UINT32 completionId, UINT32 ioStatus) { - UINT32 fileId; + UINT32 fileId = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WINPR_ASSERT(irp); @@ -2911,8 +2911,8 @@ static UINT rdpdr_server_drive_open_file_callback(RdpdrServerContext* context, w RDPDR_IRP* irp, UINT32 deviceId, UINT32 completionId, UINT32 ioStatus) { - UINT32 fileId; - UINT8 information; + UINT32 fileId = 0; + UINT8 information = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WINPR_ASSERT(irp); @@ -2986,7 +2986,7 @@ static UINT rdpdr_server_drive_read_file_callback(RdpdrServerContext* context, w RDPDR_IRP* irp, UINT32 deviceId, UINT32 completionId, UINT32 ioStatus) { - UINT32 length; + UINT32 length = 0; char* buffer = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -3068,7 +3068,7 @@ static UINT rdpdr_server_drive_write_file_callback(RdpdrServerContext* context, RDPDR_IRP* irp, UINT32 deviceId, UINT32 completionId, UINT32 ioStatus) { - UINT32 length; + UINT32 length = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WINPR_ASSERT(irp); @@ -3241,8 +3241,8 @@ static UINT rdpdr_server_drive_delete_file_callback1(RdpdrServerContext* context RDPDR_IRP* irp, UINT32 deviceId, UINT32 completionId, UINT32 ioStatus) { - UINT32 fileId; - UINT8 information; + UINT32 fileId = 0; + UINT8 information = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WINPR_ASSERT(irp); @@ -3358,7 +3358,7 @@ static UINT rdpdr_server_drive_rename_file_callback2(RdpdrServerContext* context RDPDR_IRP* irp, UINT32 deviceId, UINT32 completionId, UINT32 ioStatus) { - UINT32 length; + UINT32 length = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WINPR_ASSERT(irp); @@ -3400,8 +3400,8 @@ static UINT rdpdr_server_drive_rename_file_callback1(RdpdrServerContext* context RDPDR_IRP* irp, UINT32 deviceId, UINT32 completionId, UINT32 ioStatus) { - UINT32 fileId; - UINT8 information; + UINT32 fileId = 0; + UINT8 information = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WINPR_ASSERT(irp); @@ -3451,7 +3451,7 @@ static UINT rdpdr_server_drive_rename_file(RdpdrServerContext* context, void* ca UINT32 deviceId, const char* oldPath, const char* newPath) { - RDPDR_IRP* irp; + RDPDR_IRP* irp = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); irp = rdpdr_server_irp_new(); diff --git a/channels/rdpecam/server/camera_device_enumerator_main.c b/channels/rdpecam/server/camera_device_enumerator_main.c index 3516fc6d3..691a6640a 100644 --- a/channels/rdpecam/server/camera_device_enumerator_main.c +++ b/channels/rdpecam/server/camera_device_enumerator_main.c @@ -74,10 +74,10 @@ static UINT enumerator_server_open_channel(enumerator_server* enumerator) { CamDevEnumServerContext* context = &enumerator->context; DWORD Error = ERROR_SUCCESS; - HANDLE hEvent; + HANDLE hEvent = NULL; DWORD BytesReturned = 0; PULONG pSessionId = NULL; - UINT32 channelId; + UINT32 channelId = 0; BOOL status = TRUE; WINPR_ASSERT(enumerator); @@ -257,11 +257,11 @@ static UINT enumerator_server_recv_device_removed_notification(CamDevEnumServerC static UINT enumerator_process_message(enumerator_server* enumerator) { - BOOL rc; + BOOL rc = 0; UINT error = ERROR_INTERNAL_ERROR; - ULONG BytesReturned; + ULONG BytesReturned = 0; CAM_SHARED_MSG_HEADER header = { 0 }; - wStream* s; + wStream* s = NULL; WINPR_ASSERT(enumerator); WINPR_ASSERT(enumerator->enumerator_channel); @@ -375,11 +375,11 @@ static HANDLE enumerator_server_get_channel_handle(enumerator_server* enumerator static DWORD WINAPI enumerator_server_thread_func(LPVOID arg) { - DWORD nCount; + DWORD nCount = 0; HANDLE events[2] = { 0 }; enumerator_server* enumerator = (enumerator_server*)arg; UINT error = CHANNEL_RC_OK; - DWORD status; + DWORD status = 0; WINPR_ASSERT(enumerator); @@ -529,7 +529,7 @@ static UINT enumerator_server_packet_send(CamDevEnumServerContext* context, wStr { enumerator_server* enumerator = (enumerator_server*)context; UINT error = CHANNEL_RC_OK; - ULONG written; + ULONG written = 0; if (!WTSVirtualChannelWrite(enumerator->enumerator_channel, (PCHAR)Stream_Buffer(s), Stream_GetPosition(s), &written)) @@ -553,7 +553,7 @@ out: static UINT enumerator_send_select_version_response_pdu( CamDevEnumServerContext* context, const CAM_SELECT_VERSION_RESPONSE* selectVersionResponse) { - wStream* s; + wStream* s = NULL; s = Stream_New(NULL, CAM_HEADER_SIZE); if (!s) diff --git a/channels/rdpecam/server/camera_device_main.c b/channels/rdpecam/server/camera_device_main.c index 62b3b20a3..7819d5e42 100644 --- a/channels/rdpecam/server/camera_device_main.c +++ b/channels/rdpecam/server/camera_device_main.c @@ -74,10 +74,10 @@ static UINT device_server_open_channel(device_server* device) { CameraDeviceServerContext* context = &device->context; DWORD Error = ERROR_SUCCESS; - HANDLE hEvent; + HANDLE hEvent = NULL; DWORD BytesReturned = 0; PULONG pSessionId = NULL; - UINT32 channelId; + UINT32 channelId = 0; BOOL status = TRUE; WINPR_ASSERT(device); @@ -167,7 +167,7 @@ static UINT device_server_recv_stream_list_response(CameraDeviceServerContext* c { CAM_STREAM_LIST_RESPONSE pdu = { 0 }; UINT error = CHANNEL_RC_OK; - BYTE i; + BYTE i = 0; WINPR_ASSERT(context); WINPR_ASSERT(header); @@ -341,7 +341,7 @@ static UINT device_server_recv_property_list_response(CameraDeviceServerContext* if (pdu.N_Properties > 0) { - size_t i; + size_t i = 0; pdu.Properties = calloc(pdu.N_Properties, sizeof(CAM_PROPERTY_DESCRIPTION)); if (!pdu.Properties) @@ -399,11 +399,11 @@ static UINT device_server_recv_property_value_response(CameraDeviceServerContext static UINT device_process_message(device_server* device) { - BOOL rc; + BOOL rc = 0; UINT error = ERROR_INTERNAL_ERROR; - ULONG BytesReturned; + ULONG BytesReturned = 0; CAM_SHARED_MSG_HEADER header = { 0 }; - wStream* s; + wStream* s = NULL; WINPR_ASSERT(device); WINPR_ASSERT(device->device_channel); @@ -531,11 +531,11 @@ static HANDLE device_server_get_channel_handle(device_server* device) static DWORD WINAPI device_server_thread_func(LPVOID arg) { - DWORD nCount; + DWORD nCount = 0; HANDLE events[2] = { 0 }; device_server* device = (device_server*)arg; UINT error = CHANNEL_RC_OK; - DWORD status; + DWORD status = 0; WINPR_ASSERT(device); @@ -682,7 +682,7 @@ static BOOL device_server_context_handle(CameraDeviceServerContext* context, HAN static wStream* device_server_packet_new(size_t size, BYTE version, BYTE messageId) { - wStream* s; + wStream* s = NULL; /* Allocate what we need plus header bytes */ s = Stream_New(NULL, size + CAM_HEADER_SIZE); @@ -702,7 +702,7 @@ static UINT device_server_packet_send(CameraDeviceServerContext* context, wStrea { device_server* device = (device_server*)context; UINT error = CHANNEL_RC_OK; - ULONG written; + ULONG written = 0; WINPR_ASSERT(context); WINPR_ASSERT(s); @@ -728,7 +728,7 @@ out: static UINT device_server_write_and_send_header(CameraDeviceServerContext* context, BYTE messageId) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); @@ -769,7 +769,7 @@ static UINT device_send_media_type_list_request_pdu(CameraDeviceServerContext* context, const CAM_MEDIA_TYPE_LIST_REQUEST* mediaTypeListRequest) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(mediaTypeListRequest); @@ -787,7 +787,7 @@ static UINT device_send_current_media_type_request_pdu( CameraDeviceServerContext* context, const CAM_CURRENT_MEDIA_TYPE_REQUEST* currentMediaTypeRequest) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(currentMediaTypeRequest); @@ -805,8 +805,8 @@ static UINT device_send_start_streams_request_pdu(CameraDeviceServerContext* context, const CAM_START_STREAMS_REQUEST* startStreamsRequest) { - wStream* s; - size_t i; + wStream* s = NULL; + size_t i = 0; WINPR_ASSERT(context); WINPR_ASSERT(startStreamsRequest); @@ -847,7 +847,7 @@ static UINT device_send_stop_streams_request_pdu(CameraDeviceServerContext* cont static UINT device_send_sample_request_pdu(CameraDeviceServerContext* context, const CAM_SAMPLE_REQUEST* sampleRequest) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(sampleRequest); @@ -874,7 +874,7 @@ static UINT device_send_property_value_request_pdu(CameraDeviceServerContext* context, const CAM_PROPERTY_VALUE_REQUEST* propertyValueRequest) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(propertyValueRequest); @@ -893,7 +893,7 @@ static UINT device_send_set_property_value_request_pdu( CameraDeviceServerContext* context, const CAM_SET_PROPERTY_VALUE_REQUEST* setPropertyValueRequest) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(setPropertyValueRequest); diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c index 9d29d7f3a..2b4942eb0 100644 --- a/channels/rdpei/client/rdpei_main.c +++ b/channels/rdpei/client/rdpei_main.c @@ -123,7 +123,7 @@ static const char* rdpei_eventid_string(UINT16 event) static RDPINPUT_CONTACT_POINT* rdpei_contact(RDPEI_PLUGIN* rdpei, INT32 externalId, BOOL active) { - UINT16 i; + UINT16 i = 0; for (i = 0; i < rdpei->maxTouchContacts; i++) { @@ -153,8 +153,8 @@ static RDPINPUT_CONTACT_POINT* rdpei_contact(RDPEI_PLUGIN* rdpei, INT32 external */ static UINT rdpei_add_frame(RdpeiClientContext* context) { - UINT16 i; - RDPEI_PLUGIN* rdpei; + UINT16 i = 0; + RDPEI_PLUGIN* rdpei = NULL; RDPINPUT_TOUCH_FRAME frame = { 0 }; RDPINPUT_CONTACT_DATA contacts[MAX_CONTACTS] = { 0 }; @@ -215,7 +215,7 @@ static UINT rdpei_add_frame(RdpeiClientContext* context) static UINT rdpei_send_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s, UINT16 eventId, UINT32 pduLength) { - UINT status; + UINT status = 0; if (!callback || !s || !callback->channel || !callback->channel->Write || !callback->plugin) return ERROR_INTERNAL_ERROR; @@ -236,7 +236,7 @@ static UINT rdpei_send_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s, UINT1 static UINT rdpei_write_pen_frame(wStream* s, const RDPINPUT_PEN_FRAME* frame) { - UINT16 x; + UINT16 x = 0; if (!s || !frame) return ERROR_INTERNAL_ERROR; @@ -291,9 +291,9 @@ static UINT rdpei_write_pen_frame(wStream* s, const RDPINPUT_PEN_FRAME* frame) static UINT rdpei_send_pen_event_pdu(GENERIC_CHANNEL_CALLBACK* callback, UINT32 frameOffset, const RDPINPUT_PEN_FRAME* frames, UINT16 count) { - UINT status; - wStream* s; - UINT16 x; + UINT status = 0; + wStream* s = NULL; + UINT16 x = 0; if (!frames || (count == 0)) return ERROR_INTERNAL_ERROR; @@ -333,9 +333,9 @@ static UINT rdpei_send_pen_event_pdu(GENERIC_CHANNEL_CALLBACK* callback, UINT32 static UINT rdpei_send_pen_frame(RdpeiClientContext* context, RDPINPUT_PEN_FRAME* frame) { const UINT64 currentTime = GetTickCount64(); - RDPEI_PLUGIN* rdpei; - GENERIC_CHANNEL_CALLBACK* callback; - UINT error; + RDPEI_PLUGIN* rdpei = NULL; + GENERIC_CHANNEL_CALLBACK* callback = NULL; + UINT error = 0; if (!context) return ERROR_INTERNAL_ERROR; @@ -372,8 +372,8 @@ static UINT rdpei_send_pen_frame(RdpeiClientContext* context, RDPINPUT_PEN_FRAME static UINT rdpei_add_pen_frame(RdpeiClientContext* context) { - UINT16 i; - RDPEI_PLUGIN* rdpei; + UINT16 i = 0; + RDPEI_PLUGIN* rdpei = NULL; RDPINPUT_PEN_FRAME penFrame = { 0 }; RDPINPUT_PEN_CONTACT penContacts[MAX_PEN_CONTACTS] = { 0 }; @@ -430,10 +430,10 @@ static UINT rdpei_update(RdpeiClientContext* context) static DWORD WINAPI rdpei_periodic_update(LPVOID arg) { - DWORD status; + DWORD status = 0; RDPEI_PLUGIN* rdpei = (RDPEI_PLUGIN*)arg; UINT error = CHANNEL_RC_OK; - RdpeiClientContext* context; + RdpeiClientContext* context = NULL; if (!rdpei) { @@ -494,11 +494,11 @@ out: */ static UINT rdpei_send_cs_ready_pdu(GENERIC_CHANNEL_CALLBACK* callback) { - UINT status; - wStream* s; + UINT status = 0; + wStream* s = NULL; UINT32 flags = 0; - UINT32 pduLength; - RDPEI_PLUGIN* rdpei; + UINT32 pduLength = 0; + RDPEI_PLUGIN* rdpei = NULL; if (!callback || !callback->plugin) return ERROR_INTERNAL_ERROR; @@ -557,9 +557,9 @@ static void rdpei_print_contact_flags(UINT32 contactFlags) */ static UINT rdpei_write_touch_frame(wStream* s, RDPINPUT_TOUCH_FRAME* frame) { - UINT32 index; + UINT32 index = 0; int rectSize = 2; - RDPINPUT_CONTACT_DATA* contact; + RDPINPUT_CONTACT_DATA* contact = NULL; if (!s || !frame) return ERROR_INTERNAL_ERROR; #ifdef WITH_DEBUG_RDPEI @@ -643,10 +643,10 @@ static UINT rdpei_write_touch_frame(wStream* s, RDPINPUT_TOUCH_FRAME* frame) static UINT rdpei_send_touch_event_pdu(GENERIC_CHANNEL_CALLBACK* callback, RDPINPUT_TOUCH_FRAME* frame) { - UINT status; - wStream* s; - UINT32 pduLength; - RDPEI_PLUGIN* rdpei; + UINT status = 0; + wStream* s = NULL; + UINT32 pduLength = 0; + RDPEI_PLUGIN* rdpei = NULL; WINPR_ASSERT(callback); @@ -699,8 +699,8 @@ static UINT rdpei_send_touch_event_pdu(GENERIC_CHANNEL_CALLBACK* callback, static UINT rdpei_recv_sc_ready_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { UINT32 features = 0; - UINT32 protocolVersion; - RDPEI_PLUGIN* rdpei; + UINT32 protocolVersion = 0; + RDPEI_PLUGIN* rdpei = NULL; if (!callback || !callback->plugin) return ERROR_INTERNAL_ERROR; @@ -743,7 +743,7 @@ static UINT rdpei_recv_sc_ready_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* static UINT rdpei_recv_suspend_touch_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { UINT error = CHANNEL_RC_OK; - RdpeiClientContext* rdpei; + RdpeiClientContext* rdpei = NULL; WINPR_UNUSED(s); @@ -768,7 +768,7 @@ static UINT rdpei_recv_suspend_touch_pdu(GENERIC_CHANNEL_CALLBACK* callback, wSt */ static UINT rdpei_recv_resume_touch_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - RdpeiClientContext* rdpei; + RdpeiClientContext* rdpei = NULL; UINT error = CHANNEL_RC_OK; if (!s || !callback || !callback->plugin) return ERROR_INTERNAL_ERROR; @@ -791,9 +791,9 @@ static UINT rdpei_recv_resume_touch_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStr */ static UINT rdpei_recv_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - UINT16 eventId; - UINT32 pduLength; - UINT error; + UINT16 eventId = 0; + UINT32 pduLength = 0; + UINT error = 0; if (!s) return ERROR_INTERNAL_ERROR; @@ -888,7 +888,7 @@ static UINT rdpei_on_close(IWTSVirtualChannelCallback* pChannelCallback) static UINT32 rdpei_get_version(RdpeiClientContext* context) { - RDPEI_PLUGIN* rdpei; + RDPEI_PLUGIN* rdpei = NULL; if (!context || !context->handle) return -1; rdpei = (RDPEI_PLUGIN*)context->handle; @@ -897,7 +897,7 @@ static UINT32 rdpei_get_version(RdpeiClientContext* context) static UINT32 rdpei_get_features(RdpeiClientContext* context) { - RDPEI_PLUGIN* rdpei; + RDPEI_PLUGIN* rdpei = NULL; if (!context || !context->handle) return -1; rdpei = (RDPEI_PLUGIN*)context->handle; @@ -913,8 +913,8 @@ UINT rdpei_send_frame(RdpeiClientContext* context, RDPINPUT_TOUCH_FRAME* frame) { UINT64 currentTime = GetTickCount64(); RDPEI_PLUGIN* rdpei = (RDPEI_PLUGIN*)context->handle; - GENERIC_CHANNEL_CALLBACK* callback; - UINT error; + GENERIC_CHANNEL_CALLBACK* callback = NULL; + UINT error = 0; callback = rdpei->base.listener_callback->channel_callback; @@ -950,8 +950,8 @@ UINT rdpei_send_frame(RdpeiClientContext* context, RDPINPUT_TOUCH_FRAME* frame) */ static UINT rdpei_add_contact(RdpeiClientContext* context, const RDPINPUT_CONTACT_DATA* contact) { - RDPINPUT_CONTACT_POINT* contactPoint; - RDPEI_PLUGIN* rdpei; + RDPINPUT_CONTACT_POINT* contactPoint = NULL; + RDPEI_PLUGIN* rdpei = NULL; if (!context || !contact || !context->handle) return ERROR_INTERNAL_ERROR; @@ -971,9 +971,9 @@ static UINT rdpei_touch_process(RdpeiClientContext* context, INT32 externalId, U INT32 x, INT32 y, INT32* contactId, UINT32 fieldFlags, va_list ap) { INT64 contactIdlocal = -1; - RDPINPUT_CONTACT_POINT* contactPoint; - RDPEI_PLUGIN* rdpei; - BOOL begin; + RDPINPUT_CONTACT_POINT* contactPoint = NULL; + RDPEI_PLUGIN* rdpei = NULL; + BOOL begin = 0; UINT error = CHANNEL_RC_OK; if (!context || !contactId || !context->handle) @@ -1047,7 +1047,7 @@ static UINT rdpei_touch_process(RdpeiClientContext* context, INT32 externalId, U static UINT rdpei_touch_begin(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y, INT32* contactId) { - UINT rc; + UINT rc = 0; va_list ap = { 0 }; rc = rdpei_touch_process(context, externalId, RDPINPUT_CONTACT_FLAG_DOWN | RDPINPUT_CONTACT_FLAG_INRANGE | @@ -1064,7 +1064,7 @@ static UINT rdpei_touch_begin(RdpeiClientContext* context, INT32 externalId, INT static UINT rdpei_touch_update(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y, INT32* contactId) { - UINT rc; + UINT rc = 0; va_list ap = { 0 }; rc = rdpei_touch_process(context, externalId, RDPINPUT_CONTACT_FLAG_UPDATE | RDPINPUT_CONTACT_FLAG_INRANGE | @@ -1081,7 +1081,7 @@ static UINT rdpei_touch_update(RdpeiClientContext* context, INT32 externalId, IN static UINT rdpei_touch_end(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y, INT32* contactId) { - UINT error; + UINT error = 0; va_list ap = { 0 }; error = rdpei_touch_process(context, externalId, RDPINPUT_CONTACT_FLAG_UPDATE | RDPINPUT_CONTACT_FLAG_INRANGE | @@ -1102,7 +1102,7 @@ static UINT rdpei_touch_end(RdpeiClientContext* context, INT32 externalId, INT32 static UINT rdpei_touch_cancel(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y, INT32* contactId) { - UINT rc; + UINT rc = 0; va_list ap = { 0 }; rc = rdpei_touch_process(context, externalId, RDPINPUT_CONTACT_FLAG_UP | RDPINPUT_CONTACT_FLAG_CANCELED, x, y, @@ -1113,7 +1113,7 @@ static UINT rdpei_touch_cancel(RdpeiClientContext* context, INT32 externalId, IN static UINT rdpei_touch_raw_event(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y, INT32* contactId, UINT32 flags, UINT32 fieldFlags, ...) { - UINT rc; + UINT rc = 0; va_list ap; va_start(ap, fieldFlags); rc = rdpei_touch_process(context, externalId, flags, x, y, contactId, fieldFlags, ap); @@ -1131,7 +1131,7 @@ static UINT rdpei_touch_raw_event_va(RdpeiClientContext* context, INT32 external static RDPINPUT_PEN_CONTACT_POINT* rdpei_pen_contact(RDPEI_PLUGIN* rdpei, INT32 externalId, BOOL active) { - UINT32 x; + UINT32 x = 0; if (!rdpei) return NULL; @@ -1162,8 +1162,8 @@ static RDPINPUT_PEN_CONTACT_POINT* rdpei_pen_contact(RDPEI_PLUGIN* rdpei, INT32 static UINT rdpei_add_pen(RdpeiClientContext* context, INT32 externalId, const RDPINPUT_PEN_CONTACT* contact) { - RDPEI_PLUGIN* rdpei; - RDPINPUT_PEN_CONTACT_POINT* contactPoint; + RDPEI_PLUGIN* rdpei = NULL; + RDPINPUT_PEN_CONTACT_POINT* contactPoint = NULL; if (!context || !contact || !context->handle) return ERROR_INTERNAL_ERROR; @@ -1186,8 +1186,8 @@ static UINT rdpei_add_pen(RdpeiClientContext* context, INT32 externalId, static UINT rdpei_pen_process(RdpeiClientContext* context, INT32 externalId, UINT32 contactFlags, UINT32 fieldFlags, INT32 x, INT32 y, va_list ap) { - RDPINPUT_PEN_CONTACT_POINT* contactPoint; - RDPEI_PLUGIN* rdpei; + RDPINPUT_PEN_CONTACT_POINT* contactPoint = NULL; + RDPEI_PLUGIN* rdpei = NULL; UINT error = CHANNEL_RC_OK; if (!context || !context->handle) @@ -1241,7 +1241,7 @@ static UINT rdpei_pen_process(RdpeiClientContext* context, INT32 externalId, UIN static UINT rdpei_pen_begin(RdpeiClientContext* context, INT32 externalId, UINT32 fieldFlags, INT32 x, INT32 y, ...) { - UINT error; + UINT error = 0; va_list ap; va_start(ap, y); @@ -1262,7 +1262,7 @@ static UINT rdpei_pen_begin(RdpeiClientContext* context, INT32 externalId, UINT3 static UINT rdpei_pen_update(RdpeiClientContext* context, INT32 externalId, UINT32 fieldFlags, INT32 x, INT32 y, ...) { - UINT error; + UINT error = 0; va_list ap; va_start(ap, y); @@ -1282,7 +1282,7 @@ static UINT rdpei_pen_update(RdpeiClientContext* context, INT32 externalId, UINT static UINT rdpei_pen_end(RdpeiClientContext* context, INT32 externalId, UINT32 fieldFlags, INT32 x, INT32 y, ...) { - UINT error; + UINT error = 0; va_list ap; va_start(ap, y); error = rdpei_pen_process(context, externalId, @@ -1300,7 +1300,7 @@ static UINT rdpei_pen_end(RdpeiClientContext* context, INT32 externalId, UINT32 static UINT rdpei_pen_hover_begin(RdpeiClientContext* context, INT32 externalId, UINT32 fieldFlags, INT32 x, INT32 y, ...) { - UINT error; + UINT error = 0; va_list ap; va_start(ap, y); @@ -1320,7 +1320,7 @@ static UINT rdpei_pen_hover_begin(RdpeiClientContext* context, INT32 externalId, static UINT rdpei_pen_hover_update(RdpeiClientContext* context, INT32 externalId, UINT32 fieldFlags, INT32 x, INT32 y, ...) { - UINT error; + UINT error = 0; va_list ap; va_start(ap, y); @@ -1340,7 +1340,7 @@ static UINT rdpei_pen_hover_update(RdpeiClientContext* context, INT32 externalId static UINT rdpei_pen_hover_cancel(RdpeiClientContext* context, INT32 externalId, UINT32 fieldFlags, INT32 x, INT32 y, ...) { - UINT error; + UINT error = 0; va_list ap; va_start(ap, y); @@ -1355,7 +1355,7 @@ static UINT rdpei_pen_hover_cancel(RdpeiClientContext* context, INT32 externalId static UINT rdpei_pen_raw_event(RdpeiClientContext* context, INT32 externalId, UINT32 contactFlags, UINT32 fieldFlags, INT32 x, INT32 y, ...) { - UINT error; + UINT error = 0; va_list ap; va_start(ap, y); @@ -1373,7 +1373,7 @@ static UINT rdpei_pen_raw_event_va(RdpeiClientContext* context, INT32 externalId static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, rdpSettings* settings) { - RdpeiClientContext* context; + RdpeiClientContext* context = NULL; RDPEI_PLUGIN* rdpei = (RDPEI_PLUGIN*)base; WINPR_ASSERT(base); diff --git a/channels/rdpei/rdpei_common.c b/channels/rdpei/rdpei_common.c index 2c9f07c18..b1150fb52 100644 --- a/channels/rdpei/rdpei_common.c +++ b/channels/rdpei/rdpei_common.c @@ -31,7 +31,7 @@ BOOL rdpei_read_2byte_unsigned(wStream* s, UINT16* value) { - BYTE byte; + BYTE byte = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -57,7 +57,7 @@ BOOL rdpei_read_2byte_unsigned(wStream* s, UINT16* value) BOOL rdpei_write_2byte_unsigned(wStream* s, UINT16 value) { - BYTE byte; + BYTE byte = 0; if (!Stream_EnsureRemainingCapacity(s, 2)) return FALSE; @@ -83,8 +83,8 @@ BOOL rdpei_write_2byte_unsigned(wStream* s, UINT16 value) BOOL rdpei_read_2byte_signed(wStream* s, INT16* value) { - BYTE byte; - BOOL negative; + BYTE byte = 0; + BOOL negative = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -112,7 +112,7 @@ BOOL rdpei_read_2byte_signed(wStream* s, INT16* value) BOOL rdpei_write_2byte_signed(wStream* s, INT16 value) { - BYTE byte; + BYTE byte = 0; BOOL negative = FALSE; if (!Stream_EnsureRemainingCapacity(s, 2)) @@ -153,8 +153,8 @@ BOOL rdpei_write_2byte_signed(wStream* s, INT16 value) BOOL rdpei_read_4byte_unsigned(wStream* s, UINT32* value) { - BYTE byte; - BYTE count; + BYTE byte = 0; + BYTE count = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -205,7 +205,7 @@ BOOL rdpei_read_4byte_unsigned(wStream* s, UINT32* value) BOOL rdpei_write_4byte_unsigned(wStream* s, UINT32 value) { - BYTE byte; + BYTE byte = 0; if (!Stream_EnsureRemainingCapacity(s, 4)) return FALSE; @@ -251,9 +251,9 @@ BOOL rdpei_write_4byte_unsigned(wStream* s, UINT32 value) BOOL rdpei_read_4byte_signed(wStream* s, INT32* value) { - BYTE byte; - BYTE count; - BOOL negative; + BYTE byte = 0; + BYTE count = 0; + BOOL negative = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -308,7 +308,7 @@ BOOL rdpei_read_4byte_signed(wStream* s, INT32* value) BOOL rdpei_write_4byte_signed(wStream* s, INT32 value) { - BYTE byte; + BYTE byte = 0; BOOL negative = FALSE; if (!Stream_EnsureRemainingCapacity(s, 4)) @@ -378,8 +378,8 @@ BOOL rdpei_write_4byte_signed(wStream* s, INT32 value) BOOL rdpei_read_8byte_unsigned(wStream* s, UINT64* value) { - UINT64 byte; - BYTE count; + UINT64 byte = 0; + BYTE count = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -490,7 +490,7 @@ BOOL rdpei_read_8byte_unsigned(wStream* s, UINT64* value) BOOL rdpei_write_8byte_unsigned(wStream* s, UINT64 value) { - BYTE byte; + BYTE byte = 0; if (!Stream_EnsureRemainingCapacity(s, 8)) return FALSE; @@ -608,7 +608,7 @@ BOOL rdpei_write_8byte_unsigned(wStream* s, UINT64 value) void touch_event_reset(RDPINPUT_TOUCH_EVENT* event) { - UINT16 i; + UINT16 i = 0; for (i = 0; i < event->frameCount; i++) touch_frame_reset(&event->frames[i]); @@ -627,7 +627,7 @@ void touch_frame_reset(RDPINPUT_TOUCH_FRAME* frame) void pen_event_reset(RDPINPUT_PEN_EVENT* event) { - UINT16 i; + UINT16 i = 0; for (i = 0; i < event->frameCount; i++) pen_frame_reset(&event->frames[i]); diff --git a/channels/rdpei/server/rdpei_main.c b/channels/rdpei/server/rdpei_main.c index 3d9c02d27..601c21ced 100644 --- a/channels/rdpei/server/rdpei_main.c +++ b/channels/rdpei/server/rdpei_main.c @@ -60,7 +60,7 @@ struct s_rdpei_server_private RdpeiServerContext* rdpei_server_context_new(HANDLE vcm) { RdpeiServerContext* ret = calloc(1, sizeof(*ret)); - RdpeiServerPrivate* priv; + RdpeiServerPrivate* priv = NULL; if (!ret) return NULL; @@ -97,9 +97,9 @@ fail: UINT rdpei_server_init(RdpeiServerContext* context) { void* buffer = NULL; - DWORD bytesReturned; + DWORD bytesReturned = 0; RdpeiServerPrivate* priv = context->priv; - UINT32 channelId; + UINT32 channelId = 0; BOOL status = TRUE; priv->channelHandle = WTSVirtualChannelOpenEx(WTS_CURRENT_SESSION, RDPEI_DVC_CHANNEL_NAME, @@ -153,7 +153,7 @@ void rdpei_server_context_reset(RdpeiServerContext* context) void rdpei_server_context_free(RdpeiServerContext* context) { - RdpeiServerPrivate* priv; + RdpeiServerPrivate* priv = NULL; if (!context) return; @@ -311,9 +311,9 @@ static UINT read_pen_contact(RdpeiServerContext* context, wStream* s, */ static UINT read_touch_frame(RdpeiServerContext* context, wStream* s, RDPINPUT_TOUCH_FRAME* frame) { - UINT32 i; - RDPINPUT_CONTACT_DATA* contact; - UINT error; + UINT32 i = 0; + RDPINPUT_CONTACT_DATA* contact = NULL; + UINT error = 0; if (!rdpei_read_2byte_unsigned(s, &frame->contactCount) || !rdpei_read_8byte_unsigned(s, &frame->frameOffset)) @@ -344,9 +344,9 @@ static UINT read_touch_frame(RdpeiServerContext* context, wStream* s, RDPINPUT_T static UINT read_pen_frame(RdpeiServerContext* context, wStream* s, RDPINPUT_PEN_FRAME* frame) { - UINT32 i; - RDPINPUT_PEN_CONTACT* contact; - UINT error; + UINT32 i = 0; + RDPINPUT_PEN_CONTACT* contact = NULL; + UINT error = 0; if (!rdpei_read_2byte_unsigned(s, &frame->contactCount) || !rdpei_read_8byte_unsigned(s, &frame->frameOffset)) @@ -382,10 +382,10 @@ static UINT read_pen_frame(RdpeiServerContext* context, wStream* s, RDPINPUT_PEN */ static UINT read_touch_event(RdpeiServerContext* context, wStream* s) { - UINT16 frameCount; - UINT32 i; + UINT16 frameCount = 0; + UINT32 i = 0; RDPINPUT_TOUCH_EVENT* event = &context->priv->touchEvent; - RDPINPUT_TOUCH_FRAME* frame; + RDPINPUT_TOUCH_FRAME* frame = NULL; UINT error = CHANNEL_RC_OK; if (!rdpei_read_4byte_unsigned(s, &event->encodeTime) || @@ -424,10 +424,10 @@ out_cleanup: static UINT read_pen_event(RdpeiServerContext* context, wStream* s) { - UINT16 frameCount; - UINT32 i; + UINT16 frameCount = 0; + UINT32 i = 0; RDPINPUT_PEN_EVENT* event = &context->priv->penEvent; - RDPINPUT_PEN_FRAME* frame; + RDPINPUT_PEN_FRAME* frame = NULL; UINT error = CHANNEL_RC_OK; if (!rdpei_read_4byte_unsigned(s, &event->encodeTime) || @@ -471,7 +471,7 @@ out_cleanup: */ static UINT read_dismiss_hovering_contact(RdpeiServerContext* context, wStream* s) { - BYTE contactId; + BYTE contactId = 0; UINT error = CHANNEL_RC_OK; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) @@ -493,7 +493,7 @@ static UINT read_dismiss_hovering_contact(RdpeiServerContext* context, wStream* */ UINT rdpei_server_handle_messages(RdpeiServerContext* context) { - DWORD bytesReturned; + DWORD bytesReturned = 0; RdpeiServerPrivate* priv = context->priv; wStream* s = priv->inputStream; UINT error = CHANNEL_RC_OK; @@ -518,7 +518,7 @@ UINT rdpei_server_handle_messages(RdpeiServerContext* context) if (priv->waitingHeaders) { - UINT32 pduLen; + UINT32 pduLen = 0; /* header case */ Stream_Read_UINT16(s, priv->currentMsgType); @@ -599,7 +599,7 @@ UINT rdpei_server_handle_messages(RdpeiServerContext* context) */ UINT rdpei_server_send_sc_ready(RdpeiServerContext* context, UINT32 version, UINT32 features) { - ULONG written; + ULONG written = 0; RdpeiServerPrivate* priv = context->priv; UINT32 pduLen = 4; @@ -644,7 +644,7 @@ UINT rdpei_server_send_sc_ready(RdpeiServerContext* context, UINT32 version, UIN */ UINT rdpei_server_suspend(RdpeiServerContext* context) { - ULONG written; + ULONG written = 0; RdpeiServerPrivate* priv = context->priv; switch (priv->automataState) @@ -687,7 +687,7 @@ UINT rdpei_server_suspend(RdpeiServerContext* context) */ UINT rdpei_server_resume(RdpeiServerContext* context) { - ULONG written; + ULONG written = 0; RdpeiServerPrivate* priv = context->priv; switch (priv->automataState) diff --git a/channels/rdpemsc/server/mouse_cursor_main.c b/channels/rdpemsc/server/mouse_cursor_main.c index 8fcc3d228..f95316319 100644 --- a/channels/rdpemsc/server/mouse_cursor_main.c +++ b/channels/rdpemsc/server/mouse_cursor_main.c @@ -72,11 +72,11 @@ static UINT mouse_cursor_server_initialize(MouseCursorServerContext* context, BO static UINT mouse_cursor_server_open_channel(mouse_cursor_server* mouse_cursor) { - MouseCursorServerContext* context; + MouseCursorServerContext* context = NULL; DWORD Error = ERROR_SUCCESS; DWORD BytesReturned = 0; PULONG pSessionId = NULL; - UINT32 channelId; + UINT32 channelId = 0; BOOL status = TRUE; WINPR_ASSERT(mouse_cursor); @@ -117,10 +117,10 @@ static UINT mouse_cursor_server_open_channel(mouse_cursor_server* mouse_cursor) static BOOL read_cap_set(wStream* s, wArrayList* capsSets) { RDP_MOUSE_CURSOR_CAPSET* capsSet = NULL; - UINT32 signature; - RDP_MOUSE_CURSOR_CAPVERSION version; - UINT32 size; - size_t capsDataSize; + UINT32 signature = 0; + RDP_MOUSE_CURSOR_CAPVERSION version = RDP_MOUSE_CURSOR_CAPVERSION_INVALID; + UINT32 size = 0; + size_t capsDataSize = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 12)) return FALSE; @@ -143,7 +143,7 @@ static BOOL read_cap_set(wStream* s, wArrayList* capsSets) { case RDP_MOUSE_CURSOR_CAPVERSION_1: { - RDP_MOUSE_CURSOR_CAPSET_VERSION1* capsSetV1; + RDP_MOUSE_CURSOR_CAPSET_VERSION1* capsSetV1 = NULL; capsSetV1 = calloc(1, sizeof(RDP_MOUSE_CURSOR_CAPSET_VERSION1)); if (!capsSetV1) @@ -221,11 +221,11 @@ static UINT mouse_cursor_server_recv_cs_caps_advertise(MouseCursorServerContext* static UINT mouse_cursor_process_message(mouse_cursor_server* mouse_cursor) { - BOOL rc; + BOOL rc = 0; UINT error = ERROR_INTERNAL_ERROR; - ULONG BytesReturned; + ULONG BytesReturned = 0; RDP_MOUSE_CURSOR_HEADER header = { 0 }; - wStream* s; + wStream* s = NULL; WINPR_ASSERT(mouse_cursor); WINPR_ASSERT(mouse_cursor->mouse_cursor_channel); @@ -331,11 +331,11 @@ static HANDLE mouse_cursor_server_get_channel_handle(mouse_cursor_server* mouse_ static DWORD WINAPI mouse_cursor_server_thread_func(LPVOID arg) { - DWORD nCount; + DWORD nCount = 0; HANDLE events[2] = { 0 }; mouse_cursor_server* mouse_cursor = (mouse_cursor_server*)arg; UINT error = CHANNEL_RC_OK; - DWORD status; + DWORD status = 0; WINPR_ASSERT(mouse_cursor); @@ -484,7 +484,7 @@ static BOOL mouse_cursor_server_context_handle(MouseCursorServerContext* context static wStream* mouse_cursor_server_packet_new(size_t size, RDP_MOUSE_CURSOR_PDUTYPE pduType, const RDP_MOUSE_CURSOR_HEADER* header) { - wStream* s; + wStream* s = NULL; /* Allocate what we need plus header bytes */ s = Stream_New(NULL, size + RDPEMSC_HEADER_SIZE); @@ -505,7 +505,7 @@ static UINT mouse_cursor_server_packet_send(MouseCursorServerContext* context, w { mouse_cursor_server* mouse_cursor = (mouse_cursor_server*)context; UINT error = CHANNEL_RC_OK; - ULONG written; + ULONG written = 0; WINPR_ASSERT(mouse_cursor); WINPR_ASSERT(s); @@ -533,10 +533,10 @@ static UINT mouse_cursor_server_send_sc_caps_confirm(MouseCursorServerContext* context, const RDP_MOUSE_CURSOR_CAPS_CONFIRM_PDU* capsConfirm) { - RDP_MOUSE_CURSOR_CAPSET* capsetHeader; - RDP_MOUSE_CURSOR_PDUTYPE pduType; - size_t caps_size; - wStream* s; + RDP_MOUSE_CURSOR_CAPSET* capsetHeader = NULL; + RDP_MOUSE_CURSOR_PDUTYPE pduType = PDUTYPE_EMSC_RESERVED; + size_t caps_size = 0; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(capsConfirm); @@ -588,12 +588,12 @@ static void write_point16(wStream* s, const TS_POINT16* point16) static UINT mouse_cursor_server_send_sc_mouseptr_update( MouseCursorServerContext* context, const RDP_MOUSE_CURSOR_MOUSEPTR_UPDATE_PDU* mouseptrUpdate) { - TS_POINT16* position; - TS_POINTERATTRIBUTE* pointerAttribute; - TS_LARGEPOINTERATTRIBUTE* largePointerAttribute; - RDP_MOUSE_CURSOR_PDUTYPE pduType; + TS_POINT16* position = NULL; + TS_POINTERATTRIBUTE* pointerAttribute = NULL; + TS_LARGEPOINTERATTRIBUTE* largePointerAttribute = NULL; + RDP_MOUSE_CURSOR_PDUTYPE pduType = PDUTYPE_EMSC_RESERVED; size_t update_size = 0; - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(mouseptrUpdate); diff --git a/channels/rdpgfx/client/rdpgfx_codec.c b/channels/rdpgfx/client/rdpgfx_codec.c index 588493dc8..c9e6f39ab 100644 --- a/channels/rdpgfx/client/rdpgfx_codec.c +++ b/channels/rdpgfx/client/rdpgfx_codec.c @@ -39,9 +39,9 @@ */ static UINT rdpgfx_read_h264_metablock(RDPGFX_PLUGIN* gfx, wStream* s, RDPGFX_H264_METABLOCK* meta) { - UINT32 index; - RECTANGLE_16* regionRect; - RDPGFX_H264_QUANT_QUALITY* quantQualityVal; + UINT32 index = 0; + RECTANGLE_16* regionRect = NULL; + RDPGFX_H264_QUANT_QUALITY* quantQualityVal = NULL; UINT error = ERROR_INVALID_DATA; meta->regionRects = NULL; meta->quantQualityVals = NULL; @@ -125,8 +125,8 @@ error_out: */ static UINT rdpgfx_decode_AVC420(RDPGFX_PLUGIN* gfx, RDPGFX_SURFACE_COMMAND* cmd) { - UINT error; - wStream* s; + UINT error = 0; + wStream* s = NULL; RDPGFX_AVC420_BITMAP_STREAM h264; RdpgfxClientContext* context = gfx->context; s = Stream_New(cmd->data, cmd->length); diff --git a/channels/rdpgfx/client/rdpgfx_main.c b/channels/rdpgfx/client/rdpgfx_main.c index 4662694ad..c16f88e02 100644 --- a/channels/rdpgfx/client/rdpgfx_main.c +++ b/channels/rdpgfx/client/rdpgfx_main.c @@ -74,7 +74,7 @@ static void free_surfaces(RdpgfxClientContext* context, wHashTable* SurfaceTable static void evict_cache_slots(RdpgfxClientContext* context, UINT16 MaxCacheSlots, void** CacheSlots) { - UINT16 index; + UINT16 index = 0; WINPR_ASSERT(CacheSlots); for (index = 0; index < MaxCacheSlots; index++) @@ -103,11 +103,11 @@ static UINT rdpgfx_send_caps_advertise_pdu(RdpgfxClientContext* context, const RDPGFX_CAPS_ADVERTISE_PDU* pdu) { UINT error = CHANNEL_RC_OK; - UINT16 index; + UINT16 index = 0; RDPGFX_HEADER header = { 0 }; - RDPGFX_PLUGIN* gfx; - GENERIC_CHANNEL_CALLBACK* callback; - wStream* s; + RDPGFX_PLUGIN* gfx = NULL; + GENERIC_CHANNEL_CALLBACK* callback = NULL; + wStream* s = NULL; WINPR_ASSERT(pdu); WINPR_ASSERT(context); @@ -172,7 +172,7 @@ static BOOL rdpgfx_is_capability_filtered(RDPGFX_PLUGIN* gfx, UINT32 caps) RDPGFX_CAPVERSION_104, RDPGFX_CAPVERSION_105, RDPGFX_CAPVERSION_106, RDPGFX_CAPVERSION_106_ERR, RDPGFX_CAPVERSION_107 }; - UINT32 x; + UINT32 x = 0; for (x = 0; x < ARRAYSIZE(capList); x++) { @@ -190,9 +190,9 @@ static BOOL rdpgfx_is_capability_filtered(RDPGFX_PLUGIN* gfx, UINT32 caps) */ static UINT rdpgfx_send_supported_caps(GENERIC_CHANNEL_CALLBACK* callback) { - RDPGFX_PLUGIN* gfx; - RdpgfxClientContext* context; - RDPGFX_CAPSET* capsSet; + RDPGFX_PLUGIN* gfx = NULL; + RdpgfxClientContext* context = NULL; + RDPGFX_CAPSET* capsSet = NULL; RDPGFX_CAPSET capsSets[RDPGFX_NUMBER_CAPSETS] = { 0 }; RDPGFX_CAPS_ADVERTISE_PDU pdu = { 0 }; @@ -400,11 +400,11 @@ static UINT rdpgfx_recv_caps_confirm_pdu(GENERIC_CHANNEL_CALLBACK* callback, wSt static UINT rdpgfx_send_frame_acknowledge_pdu(RdpgfxClientContext* context, const RDPGFX_FRAME_ACKNOWLEDGE_PDU* pdu) { - UINT error; - wStream* s; + UINT error = 0; + wStream* s = NULL; RDPGFX_HEADER header = { 0 }; - RDPGFX_PLUGIN* gfx; - GENERIC_CHANNEL_CALLBACK* callback; + RDPGFX_PLUGIN* gfx = NULL; + GENERIC_CHANNEL_CALLBACK* callback = NULL; if (!context || !pdu) return ERROR_BAD_ARGUMENTS; @@ -452,11 +452,11 @@ fail: static UINT rdpgfx_send_qoe_frame_acknowledge_pdu(RdpgfxClientContext* context, const RDPGFX_QOE_FRAME_ACKNOWLEDGE_PDU* pdu) { - UINT error; - wStream* s; + UINT error = 0; + wStream* s = NULL; RDPGFX_HEADER header = { 0 }; - GENERIC_CHANNEL_CALLBACK* callback; - RDPGFX_PLUGIN* gfx; + GENERIC_CHANNEL_CALLBACK* callback = NULL; + RDPGFX_PLUGIN* gfx = NULL; header.flags = 0; header.cmdId = RDPGFX_CMDID_QOEFRAMEACKNOWLEDGE; @@ -506,9 +506,9 @@ fail: */ static UINT rdpgfx_recv_reset_graphics_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - int pad; - UINT32 index; - MONITOR_DEF* monitor; + int pad = 0; + UINT32 index = 0; + MONITOR_DEF* monitor = NULL; RDPGFX_RESET_GRAPHICS_PDU pdu = { 0 }; WINPR_ASSERT(callback); @@ -630,8 +630,8 @@ static UINT rdpgfx_recv_evict_cache_entry_pdu(GENERIC_CHANNEL_CALLBACK* callback */ static UINT rdpgfx_load_cache_import_offer(RDPGFX_PLUGIN* gfx, RDPGFX_CACHE_IMPORT_OFFER_PDU* offer) { - int idx; - int count; + int idx = 0; + int count = 0; UINT error = CHANNEL_RC_OK; PERSISTENT_CACHE_ENTRY entry; rdpPersistentCache* persistent = NULL; @@ -712,7 +712,7 @@ fail: */ static UINT rdpgfx_save_persistent_cache(RDPGFX_PLUGIN* gfx) { - int idx; + int idx = 0; UINT error = CHANNEL_RC_OK; PERSISTENT_CACHE_ENTRY cacheEntry; rdpPersistentCache* persistent = NULL; @@ -775,11 +775,11 @@ fail: static UINT rdpgfx_send_cache_import_offer_pdu(RdpgfxClientContext* context, const RDPGFX_CACHE_IMPORT_OFFER_PDU* pdu) { - UINT16 index; + UINT16 index = 0; UINT error = CHANNEL_RC_OK; - wStream* s; + wStream* s = NULL; RDPGFX_HEADER header; - GENERIC_CHANNEL_CALLBACK* callback; + GENERIC_CHANNEL_CALLBACK* callback = NULL; WINPR_ASSERT(context); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)context->handle; @@ -844,8 +844,8 @@ fail: */ static UINT rdpgfx_send_cache_offer(RDPGFX_PLUGIN* gfx) { - int idx; - int count; + int idx = 0; + int count = 0; UINT error = CHANNEL_RC_OK; PERSISTENT_CACHE_ENTRY entry; RDPGFX_CACHE_IMPORT_OFFER_PDU* offer = NULL; @@ -936,9 +936,9 @@ fail: */ static UINT rdpgfx_load_cache_import_reply(RDPGFX_PLUGIN* gfx, RDPGFX_CACHE_IMPORT_REPLY_PDU* reply) { - int idx; - int count; - UINT16 cacheSlot; + int idx = 0; + int count = 0; + UINT16 cacheSlot = 0; UINT error = CHANNEL_RC_OK; PERSISTENT_CACHE_ENTRY entry; rdpPersistentCache* persistent = NULL; @@ -1009,7 +1009,7 @@ fail: */ static UINT rdpgfx_recv_cache_import_reply_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - UINT16 idx; + UINT16 idx = 0; RDPGFX_CACHE_IMPORT_REPLY_PDU pdu; WINPR_ASSERT(callback); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)callback->plugin; @@ -1280,7 +1280,7 @@ static UINT rdpgfx_recv_wire_to_surface_1_pdu(GENERIC_CHANNEL_CALLBACK* callback RDPGFX_WIRE_TO_SURFACE_PDU_1 pdu = { 0 }; WINPR_ASSERT(callback); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)callback->plugin; - UINT error; + UINT error = 0; WINPR_ASSERT(gfx); if (!Stream_CheckAndLogRequiredLength(TAG, s, RDPGFX_WIRE_TO_SURFACE_PDU_1_SIZE)) @@ -1475,14 +1475,14 @@ static UINT rdpgfx_recv_delete_encoding_context_pdu(GENERIC_CHANNEL_CALLBACK* ca */ static UINT rdpgfx_recv_solid_fill_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - UINT16 index; - RECTANGLE_16* fillRect; + UINT16 index = 0; + RECTANGLE_16* fillRect = NULL; RDPGFX_SOLID_FILL_PDU pdu = { 0 }; WINPR_ASSERT(callback); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)callback->plugin; WINPR_ASSERT(gfx); RdpgfxClientContext* context = gfx->context; - UINT error; + UINT error = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) return ERROR_INVALID_DATA; @@ -1544,14 +1544,14 @@ static UINT rdpgfx_recv_solid_fill_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStre */ static UINT rdpgfx_recv_surface_to_surface_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - UINT16 index; - RDPGFX_POINT16* destPt; + UINT16 index = 0; + RDPGFX_POINT16* destPt = NULL; RDPGFX_SURFACE_TO_SURFACE_PDU pdu = { 0 }; WINPR_ASSERT(callback); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)callback->plugin; WINPR_ASSERT(gfx); RdpgfxClientContext* context = gfx->context; - UINT error; + UINT error = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 14)) return ERROR_INVALID_DATA; @@ -1625,7 +1625,7 @@ static UINT rdpgfx_recv_surface_to_cache_pdu(GENERIC_CHANNEL_CALLBACK* callback, WINPR_ASSERT(gfx); RdpgfxClientContext* context = gfx->context; - UINT error; + UINT error = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 20)) return ERROR_INVALID_DATA; @@ -1667,8 +1667,8 @@ static UINT rdpgfx_recv_surface_to_cache_pdu(GENERIC_CHANNEL_CALLBACK* callback, */ static UINT rdpgfx_recv_cache_to_surface_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - UINT16 index; - RDPGFX_POINT16* destPt; + UINT16 index = 0; + RDPGFX_POINT16* destPt = NULL; RDPGFX_CACHE_TO_SURFACE_PDU pdu = { 0 }; WINPR_ASSERT(callback); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)callback->plugin; @@ -1887,9 +1887,9 @@ static UINT rdpgfx_recv_map_surface_to_scaled_window_pdu(GENERIC_CHANNEL_CALLBAC */ static UINT rdpgfx_recv_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - size_t end; + size_t end = 0; RDPGFX_HEADER header = { 0 }; - UINT error; + UINT error = 0; WINPR_ASSERT(callback); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)callback->plugin; const size_t beg = Stream_GetPosition(s); @@ -2092,7 +2092,7 @@ static UINT rdpgfx_recv_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) */ static UINT rdpgfx_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* data) { - wStream* s; + wStream* s = NULL; int status = 0; UINT32 DstSize = 0; BYTE* pDstData = NULL; @@ -2224,7 +2224,7 @@ static void terminate_plugin_cb(GENERIC_DYNVC_PLUGIN* base) */ static UINT rdpgfx_set_surface_data(RdpgfxClientContext* context, UINT16 surfaceId, void* pData) { - ULONG_PTR key; + ULONG_PTR key = 0; WINPR_ASSERT(context); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)context->handle; WINPR_ASSERT(gfx); @@ -2249,9 +2249,9 @@ static UINT rdpgfx_set_surface_data(RdpgfxClientContext* context, UINT16 surface static UINT rdpgfx_get_surface_ids(RdpgfxClientContext* context, UINT16** ppSurfaceIds, UINT16* count_out) { - size_t count; - size_t index; - UINT16* pSurfaceIds; + size_t count = 0; + size_t index = 0; + UINT16* pSurfaceIds = NULL; ULONG_PTR* pKeys = NULL; WINPR_ASSERT(context); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)context->handle; @@ -2288,7 +2288,7 @@ static UINT rdpgfx_get_surface_ids(RdpgfxClientContext* context, UINT16** ppSurf static void* rdpgfx_get_surface_data(RdpgfxClientContext* context, UINT16 surfaceId) { - ULONG_PTR key; + ULONG_PTR key = 0; void* pData = NULL; WINPR_ASSERT(context); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)context->handle; @@ -2341,7 +2341,7 @@ static void* rdpgfx_get_cache_slot_data(RdpgfxClientContext* context, UINT16 cac static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, rdpSettings* settings) { - RdpgfxClientContext* context; + RdpgfxClientContext* context = NULL; RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)base; WINPR_ASSERT(base); @@ -2396,7 +2396,7 @@ static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, rdp void rdpgfx_client_context_free(RdpgfxClientContext* context) { - RDPGFX_PLUGIN* gfx; + RDPGFX_PLUGIN* gfx = NULL; if (!context) return; diff --git a/channels/rdpgfx/server/rdpgfx_main.c b/channels/rdpgfx/server/rdpgfx_main.c index f0a41347f..94e647a35 100644 --- a/channels/rdpgfx/server/rdpgfx_main.c +++ b/channels/rdpgfx/server/rdpgfx_main.c @@ -113,12 +113,12 @@ static INLINE BOOL rdpgfx_server_packet_complete_header(wStream* s, size_t start */ static UINT rdpgfx_server_packet_send(RdpgfxServerContext* context, wStream* s) { - UINT error; + UINT error = 0; UINT32 flags = 0; - ULONG written; + ULONG written = 0; BYTE* pSrcData = Stream_Buffer(s); UINT32 SrcSize = Stream_GetPosition(s); - wStream* fs; + wStream* fs = NULL; /* Allocate new stream with enough capacity. Additional overhead is * descriptor (1 bytes) + segmentCount (2 bytes) + uncompressedSize (4 bytes) * + segmentCount * size (4 bytes) */ @@ -174,8 +174,8 @@ out: */ static wStream* rdpgfx_server_single_packet_new(wLog* log, UINT16 cmdId, UINT32 dataLen) { - UINT error; - wStream* s; + UINT error = 0; + wStream* s = NULL; UINT32 pduLength = rdpgfx_pdu_length(dataLen); s = Stream_New(NULL, pduLength); @@ -220,8 +220,8 @@ static INLINE UINT rdpgfx_server_single_packet_send(RdpgfxServerContext* context static UINT rdpgfx_send_caps_confirm_pdu(RdpgfxServerContext* context, const RDPGFX_CAPS_CONFIRM_PDU* capsConfirm) { - wStream* s; - RDPGFX_CAPSET* capsSet; + wStream* s = NULL; + RDPGFX_CAPSET* capsSet = NULL; WINPR_ASSERT(context); WINPR_ASSERT(capsConfirm); @@ -265,8 +265,8 @@ static UINT rdpgfx_send_reset_graphics_pdu(RdpgfxServerContext* context, { if (!checkCapsAreExchanged(context)) return CHANNEL_RC_NOT_INITIALIZED; - UINT32 index; - wStream* s; + UINT32 index = 0; + wStream* s = NULL; /* Check monitorCount. This ensures total size within 340 bytes) */ if (pdu->monitorCount >= 16) @@ -576,9 +576,9 @@ static INLINE UINT16 rdpgfx_surface_command_cmdid(const RDPGFX_SURFACE_COMMAND* */ static UINT rdpgfx_write_h264_metablock(wLog* log, wStream* s, const RDPGFX_H264_METABLOCK* meta) { - UINT32 index; - RECTANGLE_16* regionRect; - RDPGFX_H264_QUANT_QUALITY* quantQualityVal; + UINT32 index = 0; + RECTANGLE_16* regionRect = NULL; + RDPGFX_H264_QUANT_QUALITY* quantQualityVal = NULL; UINT error = CHANNEL_RC_OK; if (!Stream_EnsureRemainingCapacity(s, 4 + meta->numRegionRects * 10)) @@ -769,7 +769,7 @@ static UINT rdpgfx_send_surface_command(RdpgfxServerContext* context, if (!checkCapsAreExchanged(context)) return CHANNEL_RC_NOT_INITIALIZED; UINT error = CHANNEL_RC_OK; - wStream* s; + wStream* s = NULL; s = rdpgfx_server_single_packet_new(context->priv->log, rdpgfx_surface_command_cmdid(cmd), rdpgfx_estimate_surface_command(cmd)); @@ -810,7 +810,7 @@ static UINT rdpgfx_send_surface_frame_command(RdpgfxServerContext* context, if (!checkCapsAreExchanged(context)) return CHANNEL_RC_NOT_INITIALIZED; UINT error = CHANNEL_RC_OK; - wStream* s; + wStream* s = NULL; UINT32 position = 0; UINT32 size = rdpgfx_pdu_length(rdpgfx_estimate_surface_command(cmd)); @@ -932,8 +932,8 @@ static UINT rdpgfx_send_solid_fill_pdu(RdpgfxServerContext* context, if (!checkCapsAreExchanged(context)) return CHANNEL_RC_NOT_INITIALIZED; UINT error = CHANNEL_RC_OK; - UINT16 index; - RECTANGLE_16* fillRect; + UINT16 index = 0; + RECTANGLE_16* fillRect = NULL; wStream* s = rdpgfx_server_single_packet_new(context->priv->log, RDPGFX_CMDID_SOLIDFILL, 8 + 8 * pdu->fillRectCount); @@ -984,8 +984,8 @@ static UINT rdpgfx_send_surface_to_surface_pdu(RdpgfxServerContext* context, if (!checkCapsAreExchanged(context)) return CHANNEL_RC_NOT_INITIALIZED; UINT error = CHANNEL_RC_OK; - UINT16 index; - RDPGFX_POINT16* destPt; + UINT16 index = 0; + RDPGFX_POINT16* destPt = NULL; wStream* s = rdpgfx_server_single_packet_new(context->priv->log, RDPGFX_CMDID_SURFACETOSURFACE, 14 + 4 * pdu->destPtsCount); @@ -1075,8 +1075,8 @@ static UINT rdpgfx_send_cache_to_surface_pdu(RdpgfxServerContext* context, if (!checkCapsAreExchanged(context)) return CHANNEL_RC_NOT_INITIALIZED; UINT error = CHANNEL_RC_OK; - UINT16 index; - RDPGFX_POINT16* destPt; + UINT16 index = 0; + RDPGFX_POINT16* destPt = NULL; wStream* s = rdpgfx_server_single_packet_new(context->priv->log, RDPGFX_CMDID_CACHETOSURFACE, 6 + 4 * pdu->destPtsCount); @@ -1224,9 +1224,9 @@ static UINT rdpgfx_recv_cache_import_offer_pdu(RdpgfxServerContext* context, wSt { if (!checkCapsAreExchanged(context)) return CHANNEL_RC_NOT_INITIALIZED; - UINT16 index; + UINT16 index = 0; RDPGFX_CACHE_IMPORT_OFFER_PDU pdu = { 0 }; - RDPGFX_CACHE_ENTRY_METADATA* cacheEntry; + RDPGFX_CACHE_ENTRY_METADATA* cacheEntry = NULL; UINT error = CHANNEL_RC_OK; if (!Stream_CheckAndLogRequiredLength(TAG, s, 2)) @@ -1272,7 +1272,7 @@ static UINT rdpgfx_recv_cache_import_offer_pdu(RdpgfxServerContext* context, wSt */ static UINT rdpgfx_recv_caps_advertise_pdu(RdpgfxServerContext* context, wStream* s) { - UINT16 index; + UINT16 index = 0; RDPGFX_CAPSET* capsSets = NULL; RDPGFX_CAPS_ADVERTISE_PDU pdu = { 0 }; UINT error = ERROR_INVALID_DATA; @@ -1390,8 +1390,8 @@ rdpgfx_send_map_surface_to_scaled_output_pdu(RdpgfxServerContext* context, */ static UINT rdpgfx_server_receive_pdu(RdpgfxServerContext* context, wStream* s) { - size_t beg; - size_t end; + size_t beg = 0; + size_t end = 0; RDPGFX_HEADER header; UINT error = CHANNEL_RC_OK; beg = Stream_GetPosition(s); @@ -1480,7 +1480,7 @@ static DWORD WINAPI rdpgfx_server_thread_func(LPVOID arg) WINPR_ASSERT(context); RdpgfxServerPrivate* priv = context->priv; - DWORD status; + DWORD status = 0; DWORD nCount = 0; HANDLE events[8] = { 0 }; UINT error = CHANNEL_RC_OK; @@ -1541,7 +1541,7 @@ static BOOL rdpgfx_server_open(RdpgfxServerContext* context) PULONG pSessionId = NULL; DWORD BytesReturned = 0; priv->SessionId = WTS_CURRENT_SESSION; - UINT32 channelId; + UINT32 channelId = 0; BOOL status = TRUE; if (WTSQuerySessionInformationA(context->vcm, WTS_CURRENT_SESSION, WTSSessionId, @@ -1791,8 +1791,8 @@ HANDLE rdpgfx_server_get_event_handle(RdpgfxServerContext* context) */ UINT rdpgfx_server_handle_messages(RdpgfxServerContext* context) { - DWORD BytesReturned; - void* buffer; + DWORD BytesReturned = 0; + void* buffer = NULL; UINT ret = CHANNEL_RC_OK; WINPR_ASSERT(context); diff --git a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c index f4b2f47c2..da4dbf5ec 100644 --- a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c +++ b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c @@ -69,9 +69,9 @@ typedef struct static int rdpsnd_alsa_set_hw_params(rdpsndAlsaPlugin* alsa) { - int status; - snd_pcm_hw_params_t* hw_params; - snd_pcm_uframes_t buffer_size_max; + int status = 0; + snd_pcm_hw_params_t* hw_params = NULL; + snd_pcm_uframes_t buffer_size_max = 0; status = snd_pcm_hw_params_malloc(&hw_params); SND_PCM_CHECK("snd_pcm_hw_params_malloc", status); status = snd_pcm_hw_params_any(alsa->pcm_handle, hw_params); @@ -139,8 +139,8 @@ static int rdpsnd_alsa_set_hw_params(rdpsndAlsaPlugin* alsa) static int rdpsnd_alsa_set_sw_params(rdpsndAlsaPlugin* alsa) { - int status; - snd_pcm_sw_params_t* sw_params; + int status = 0; + snd_pcm_sw_params_t* sw_params = NULL; status = snd_pcm_sw_params_malloc(&sw_params); SND_PCM_CHECK("snd_pcm_sw_params_malloc", status); status = snd_pcm_sw_params_current(alsa->pcm_handle, sw_params); @@ -161,9 +161,9 @@ static int rdpsnd_alsa_set_sw_params(rdpsndAlsaPlugin* alsa) static int rdpsnd_alsa_validate_params(rdpsndAlsaPlugin* alsa) { - int status; - snd_pcm_uframes_t buffer_size; - snd_pcm_uframes_t period_size; + int status = 0; + snd_pcm_uframes_t buffer_size = 0; + snd_pcm_uframes_t period_size = 0; status = snd_pcm_get_params(alsa->pcm_handle, &buffer_size, &period_size); SND_PCM_CHECK("snd_pcm_get_params", status); return 0; @@ -232,7 +232,7 @@ static void rdpsnd_alsa_close_mixer(rdpsndAlsaPlugin* alsa) static BOOL rdpsnd_alsa_open_mixer(rdpsndAlsaPlugin* alsa) { - int status; + int status = 0; if (alsa->mixer_handle) return TRUE; @@ -287,8 +287,8 @@ static void rdpsnd_alsa_pcm_close(rdpsndAlsaPlugin* alsa) static BOOL rdpsnd_alsa_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* format, UINT32 latency) { - int mode; - int status; + int mode = 0; + int status = 0; rdpsndAlsaPlugin* alsa = (rdpsndAlsaPlugin*)device; if (alsa->pcm_handle) @@ -346,14 +346,14 @@ static BOOL rdpsnd_alsa_format_supported(rdpsndDevicePlugin* device, const AUDIO static UINT32 rdpsnd_alsa_get_volume(rdpsndDevicePlugin* device) { - long volume_min; - long volume_max; - long volume_left; - long volume_right; - UINT32 dwVolume; - UINT16 dwVolumeLeft; - UINT16 dwVolumeRight; - snd_mixer_elem_t* elem; + long volume_min = 0; + long volume_max = 0; + long volume_left = 0; + long volume_right = 0; + UINT32 dwVolume = 0; + UINT16 dwVolumeLeft = 0; + UINT16 dwVolumeRight = 0; + snd_mixer_elem_t* elem = NULL; rdpsndAlsaPlugin* alsa = (rdpsndAlsaPlugin*)device; dwVolumeLeft = ((50 * 0xFFFF) / 100); /* 50% */ dwVolumeRight = ((50 * 0xFFFF) / 100); /* 50% */ @@ -382,13 +382,13 @@ static UINT32 rdpsnd_alsa_get_volume(rdpsndDevicePlugin* device) static BOOL rdpsnd_alsa_set_volume(rdpsndDevicePlugin* device, UINT32 value) { - long left; - long right; - long volume_min; - long volume_max; - long volume_left; - long volume_right; - snd_mixer_elem_t* elem; + long left = 0; + long right = 0; + long volume_min = 0; + long volume_max = 0; + long volume_left = 0; + long volume_right = 0; + snd_mixer_elem_t* elem = NULL; rdpsndAlsaPlugin* alsa = (rdpsndAlsaPlugin*)device; if (!rdpsnd_alsa_open_mixer(alsa)) @@ -421,9 +421,9 @@ static BOOL rdpsnd_alsa_set_volume(rdpsndDevicePlugin* device, UINT32 value) static UINT rdpsnd_alsa_play(rdpsndDevicePlugin* device, const BYTE* data, size_t size) { - UINT latency; + UINT latency = 0; size_t offset = 0; - int frame_size; + int frame_size = 0; rdpsndAlsaPlugin* alsa = (rdpsndAlsaPlugin*)device; WINPR_ASSERT(alsa); WINPR_ASSERT(data || (size == 0)); @@ -451,8 +451,8 @@ static UINT rdpsnd_alsa_play(rdpsndDevicePlugin* device, const BYTE* data, size_ } { - snd_pcm_sframes_t available; - snd_pcm_sframes_t delay; + snd_pcm_sframes_t available = 0; + snd_pcm_sframes_t delay = 0; int rc = snd_pcm_avail_delay(alsa->pcm_handle, &available, &delay); if (rc != 0) @@ -473,9 +473,9 @@ static UINT rdpsnd_alsa_play(rdpsndDevicePlugin* device, const BYTE* data, size_ */ static UINT rdpsnd_alsa_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN_ARGV* args) { - int status; - DWORD flags; - const COMMAND_LINE_ARGUMENT_A* arg; + int status = 0; + DWORD flags = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; rdpsndAlsaPlugin* alsa = (rdpsndAlsaPlugin*)device; COMMAND_LINE_ARGUMENT_A rdpsnd_alsa_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "device" }, @@ -519,9 +519,9 @@ static UINT rdpsnd_alsa_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN FREERDP_ENTRY_POINT(UINT alsa_freerdp_rdpsnd_client_subsystem_entry( PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)) { - const ADDIN_ARGV* args; - rdpsndAlsaPlugin* alsa; - UINT error; + const ADDIN_ARGV* args = NULL; + rdpsndAlsaPlugin* alsa = NULL; + UINT error = 0; alsa = (rdpsndAlsaPlugin*)calloc(1, sizeof(rdpsndAlsaPlugin)); if (!alsa) diff --git a/channels/rdpsnd/client/fake/rdpsnd_fake.c b/channels/rdpsnd/client/fake/rdpsnd_fake.c index 3b2d36a19..35251d26c 100644 --- a/channels/rdpsnd/client/fake/rdpsnd_fake.c +++ b/channels/rdpsnd/client/fake/rdpsnd_fake.c @@ -79,9 +79,9 @@ static UINT rdpsnd_fake_play(rdpsndDevicePlugin* device, const BYTE* data, size_ */ static UINT rdpsnd_fake_parse_addin_args(rdpsndFakePlugin* fake, const ADDIN_ARGV* args) { - int status; - DWORD flags; - const COMMAND_LINE_ARGUMENT_A* arg; + int status = 0; + DWORD flags = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; COMMAND_LINE_ARGUMENT_A rdpsnd_fake_args[] = { { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; @@ -112,8 +112,8 @@ static UINT rdpsnd_fake_parse_addin_args(rdpsndFakePlugin* fake, const ADDIN_ARG FREERDP_ENTRY_POINT(UINT fake_freerdp_rdpsnd_client_subsystem_entry( PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)) { - const ADDIN_ARGV* args; - rdpsndFakePlugin* fake; + const ADDIN_ARGV* args = NULL; + rdpsndFakePlugin* fake = NULL; UINT ret = CHANNEL_RC_OK; fake = (rdpsndFakePlugin*)calloc(1, sizeof(rdpsndFakePlugin)); diff --git a/channels/rdpsnd/client/oss/rdpsnd_oss.c b/channels/rdpsnd/client/oss/rdpsnd_oss.c index dc9aca742..54869abf8 100644 --- a/channels/rdpsnd/client/oss/rdpsnd_oss.c +++ b/channels/rdpsnd/client/oss/rdpsnd_oss.c @@ -298,10 +298,10 @@ static void rdpsnd_oss_free(rdpsndDevicePlugin* device) static UINT32 rdpsnd_oss_get_volume(rdpsndDevicePlugin* device) { - int vol; - UINT32 dwVolume; - UINT16 dwVolumeLeft; - UINT16 dwVolumeRight; + int vol = 0; + UINT32 dwVolume = 0; + UINT16 dwVolumeLeft = 0; + UINT16 dwVolumeRight = 0; rdpsndOssPlugin* oss = (rdpsndOssPlugin*)device; /* On error return 50% volume. */ dwVolumeLeft = ((50 * 0xFFFF) / 100); /* 50% */ @@ -325,8 +325,8 @@ static UINT32 rdpsnd_oss_get_volume(rdpsndDevicePlugin* device) static BOOL rdpsnd_oss_set_volume(rdpsndDevicePlugin* device, UINT32 value) { - int left; - int right; + int left = 0; + int right = 0; rdpsndOssPlugin* oss = (rdpsndOssPlugin*)device; if (device == NULL || oss->mixer_handle == -1) @@ -388,11 +388,11 @@ static UINT rdpsnd_oss_play(rdpsndDevicePlugin* device, const BYTE* data, size_t static int rdpsnd_oss_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN_ARGV* args) { - int status; - char* str_num; - char* eptr; - DWORD flags; - const COMMAND_LINE_ARGUMENT_A* arg; + int status = 0; + char* str_num = NULL; + char* eptr = NULL; + DWORD flags = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; rdpsndOssPlugin* oss = (rdpsndOssPlugin*)device; COMMAND_LINE_ARGUMENT_A rdpsnd_oss_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "device" }, @@ -451,7 +451,7 @@ static int rdpsnd_oss_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN_A FREERDP_ENTRY_POINT(UINT oss_freerdp_rdpsnd_client_subsystem_entry( PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)) { - const ADDIN_ARGV* args; + const ADDIN_ARGV* args = NULL; rdpsndOssPlugin* oss = (rdpsndOssPlugin*)calloc(1, sizeof(rdpsndOssPlugin)); if (!oss) diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c index 163affec1..725f7ed81 100644 --- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c +++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c @@ -89,7 +89,7 @@ static BOOL rdpsnd_pulse_format_supported(rdpsndDevicePlugin* device, const AUDI static void rdpsnd_pulse_get_sink_info(pa_context* c, const pa_sink_info* i, int eol, void* userdata) { - uint8_t x; + uint8_t x = 0; UINT16 dwVolumeLeft = ((50 * 0xFFFF) / 100); /* 50% */ UINT16 dwVolumeRight = ((50 * 0xFFFF) / 100); /* 50% */ rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)userdata; @@ -125,13 +125,12 @@ static void rdpsnd_pulse_get_sink_info(pa_context* c, const pa_sink_info* i, int static void rdpsnd_pulse_context_state_callback(pa_context* context, void* userdata) { - pa_context_state_t state; rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)userdata; WINPR_ASSERT(context); WINPR_ASSERT(pulse); - state = pa_context_get_state(context); + pa_context_state_t state = pa_context_get_state(context); switch (state) { @@ -159,9 +158,9 @@ static void rdpsnd_pulse_context_state_callback(pa_context* context, void* userd static BOOL rdpsnd_pulse_connect(rdpsndDevicePlugin* device) { - BOOL rc; - pa_operation* o; - pa_context_state_t state; + BOOL rc = 0; + pa_operation* o = NULL; + pa_context_state_t state = PA_CONTEXT_FAILED; rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)device; if (!rdpsnd_check_pulse(pulse, FALSE)) @@ -237,14 +236,13 @@ static void rdpsnd_pulse_wait_for_operation(rdpsndPulsePlugin* pulse, pa_operati static void rdpsnd_pulse_stream_state_callback(pa_stream* stream, void* userdata) { - pa_stream_state_t state; rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)userdata; WINPR_ASSERT(stream); if (!rdpsnd_check_pulse(pulse, TRUE)) return; - state = pa_stream_get_state(stream); + pa_stream_state_t state = pa_stream_get_state(stream); switch (state) { @@ -365,8 +363,8 @@ static BOOL rdpsnd_pulse_context_connect(rdpsndDevicePlugin* device) static BOOL rdpsnd_pulse_open_stream(rdpsndDevicePlugin* device) { - pa_stream_state_t state; - pa_stream_flags_t flags; + pa_stream_state_t state = PA_STREAM_FAILED; + pa_stream_flags_t flags = PA_STREAM_NOFLAGS; pa_buffer_attr buffer_attr = { 0 }; char ss[PA_SAMPLE_SPEC_SNPRINT_MAX] = { 0 }; rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)device; @@ -546,7 +544,7 @@ BOOL rdpsnd_pulse_format_supported(rdpsndDevicePlugin* device, const AUDIO_FORMA static UINT32 rdpsnd_pulse_get_volume(rdpsndDevicePlugin* device) { - pa_operation* o; + pa_operation* o = NULL; rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)device; if (!rdpsnd_check_pulse(pulse, FALSE)) @@ -574,9 +572,9 @@ static void rdpsnd_set_volume_success_cb(pa_context* c, int success, void* userd static BOOL rdpsnd_pulse_set_volume(rdpsndDevicePlugin* device, UINT32 value) { pa_cvolume cv = { 0 }; - pa_volume_t left; - pa_volume_t right; - pa_operation* operation; + pa_volume_t left = 0; + pa_volume_t right = 0; + pa_operation* operation = NULL; rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)device; if (!rdpsnd_check_pulse(pulse, TRUE)) @@ -604,11 +602,11 @@ static BOOL rdpsnd_pulse_set_volume(rdpsndDevicePlugin* device, UINT32 value) static UINT rdpsnd_pulse_play(rdpsndDevicePlugin* device, const BYTE* data, size_t size) { - size_t length; - void* pa_data; - int status; - pa_usec_t latency; - int negative; + size_t length = 0; + void* pa_data = NULL; + int status = 0; + pa_usec_t latency = 0; + int negative = 0; rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)device; if (!data) @@ -656,9 +654,9 @@ static UINT rdpsnd_pulse_play(rdpsndDevicePlugin* device, const BYTE* data, size static UINT rdpsnd_pulse_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN_ARGV* args) { - int status; - DWORD flags; - const COMMAND_LINE_ARGUMENT_A* arg; + int status = 0; + DWORD flags = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)device; COMMAND_LINE_ARGUMENT_A rdpsnd_pulse_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "device" }, @@ -710,9 +708,9 @@ static UINT rdpsnd_pulse_parse_addin_args(rdpsndDevicePlugin* device, const ADDI FREERDP_ENTRY_POINT(UINT pulse_freerdp_rdpsnd_client_subsystem_entry( PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)) { - const ADDIN_ARGV* args; - rdpsndPulsePlugin* pulse; - UINT ret; + const ADDIN_ARGV* args = NULL; + rdpsndPulsePlugin* pulse = NULL; + UINT ret = 0; WINPR_ASSERT(pEntryPoints); diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c index 346bd9174..e2fbad553 100644 --- a/channels/rdpsnd/client/rdpsnd_main.c +++ b/channels/rdpsnd/client/rdpsnd_main.c @@ -140,7 +140,7 @@ static UINT rdpsnd_virtual_channel_write(rdpsndPlugin* rdpsnd, wStream* s); */ static UINT rdpsnd_send_quality_mode_pdu(rdpsndPlugin* rdpsnd) { - wStream* pdu; + wStream* pdu = NULL; WINPR_ASSERT(rdpsnd); pdu = Stream_New(NULL, 8); @@ -162,7 +162,7 @@ static UINT rdpsnd_send_quality_mode_pdu(rdpsndPlugin* rdpsnd) static void rdpsnd_select_supported_audio_formats(rdpsndPlugin* rdpsnd) { - UINT16 index; + UINT16 index = 0; WINPR_ASSERT(rdpsnd); audio_formats_free(rdpsnd->ClientFormats, rdpsnd->NumberOfClientFormats); rdpsnd->NumberOfClientFormats = 0; @@ -200,11 +200,11 @@ static void rdpsnd_select_supported_audio_formats(rdpsndPlugin* rdpsnd) */ static UINT rdpsnd_send_client_audio_formats(rdpsndPlugin* rdpsnd) { - UINT16 index; - wStream* pdu; - UINT16 length; - UINT32 dwVolume; - UINT16 wNumberOfFormats; + UINT16 index = 0; + wStream* pdu = NULL; + UINT16 length = 0; + UINT32 dwVolume = 0; + UINT16 wNumberOfFormats = 0; WINPR_ASSERT(rdpsnd); if (!rdpsnd->device || (!rdpsnd->dynamic && (rdpsnd->OpenHandle == 0))) @@ -260,8 +260,8 @@ static UINT rdpsnd_send_client_audio_formats(rdpsndPlugin* rdpsnd) */ static UINT rdpsnd_recv_server_audio_formats_pdu(rdpsndPlugin* rdpsnd, wStream* s) { - UINT16 index; - UINT16 wNumberOfFormats; + UINT16 index = 0; + UINT16 wNumberOfFormats = 0; UINT ret = ERROR_BAD_LENGTH; WINPR_ASSERT(rdpsnd); @@ -333,7 +333,7 @@ out_fail: static UINT rdpsnd_send_training_confirm_pdu(rdpsndPlugin* rdpsnd, UINT16 wTimeStamp, UINT16 wPackSize) { - wStream* pdu; + wStream* pdu = NULL; WINPR_ASSERT(rdpsnd); pdu = Stream_New(NULL, 8); @@ -361,8 +361,8 @@ static UINT rdpsnd_send_training_confirm_pdu(rdpsndPlugin* rdpsnd, UINT16 wTimeS */ static UINT rdpsnd_recv_training_pdu(rdpsndPlugin* rdpsnd, wStream* s) { - UINT16 wTimeStamp; - UINT16 wPackSize; + UINT16 wTimeStamp = 0; + UINT16 wPackSize = 0; WINPR_ASSERT(rdpsnd); WINPR_ASSERT(s); @@ -400,8 +400,8 @@ static BOOL rdpsnd_ensure_device_is_open(rdpsndPlugin* rdpsnd, UINT32 wFormatNo, if (!rdpsnd->isOpen || (wFormatNo != rdpsnd->wCurrentFormatNo)) { - BOOL rc; - BOOL supported; + BOOL rc = 0; + BOOL supported = 0; AUDIO_FORMAT deviceFormat = *format; IFCALL(rdpsnd->device->Close, rdpsnd->device); @@ -450,8 +450,8 @@ static BOOL rdpsnd_ensure_device_is_open(rdpsndPlugin* rdpsnd, UINT32 wFormatNo, */ static UINT rdpsnd_recv_wave_info_pdu(rdpsndPlugin* rdpsnd, wStream* s, UINT16 BodySize) { - UINT16 wFormatNo; - const AUDIO_FORMAT* format; + UINT16 wFormatNo = 0; + const AUDIO_FORMAT* format = NULL; WINPR_ASSERT(rdpsnd); WINPR_ASSERT(s); @@ -490,7 +490,7 @@ static UINT rdpsnd_recv_wave_info_pdu(rdpsndPlugin* rdpsnd, wStream* s, UINT16 B static UINT rdpsnd_send_wave_confirm_pdu(rdpsndPlugin* rdpsnd, UINT16 wTimeStamp, BYTE cConfirmedBlockNo) { - wStream* pdu; + wStream* pdu = NULL; WINPR_ASSERT(rdpsnd); pdu = Stream_New(NULL, 8); @@ -511,12 +511,12 @@ static UINT rdpsnd_send_wave_confirm_pdu(rdpsndPlugin* rdpsnd, UINT16 wTimeStamp static BOOL rdpsnd_detect_overrun(rdpsndPlugin* rdpsnd, const AUDIO_FORMAT* format, size_t size) { - UINT32 bpf; - UINT32 now; - UINT32 duration; - UINT32 totalDuration; - UINT32 remainingDuration; - UINT32 maxDuration; + UINT32 bpf = 0; + UINT32 now = 0; + UINT32 duration = 0; + UINT32 totalDuration = 0; + UINT32 remainingDuration = 0; + UINT32 maxDuration = 0; if (!rdpsnd || !format) return FALSE; @@ -599,12 +599,12 @@ static BOOL rdpsnd_detect_overrun(rdpsndPlugin* rdpsnd, const AUDIO_FORMAT* form static UINT rdpsnd_treat_wave(rdpsndPlugin* rdpsnd, wStream* s, size_t size) { - AUDIO_FORMAT* format; - UINT64 end; - UINT64 diffMS; - UINT64 ts; + AUDIO_FORMAT* format = NULL; + UINT64 end = 0; + UINT64 diffMS = 0; + UINT64 ts = 0; UINT latency = 0; - UINT error; + UINT error = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, size)) return ERROR_BAD_LENGTH; @@ -695,9 +695,9 @@ static UINT rdpsnd_recv_wave_pdu(rdpsndPlugin* rdpsnd, wStream* s) static UINT rdpsnd_recv_wave2_pdu(rdpsndPlugin* rdpsnd, wStream* s, UINT16 BodySize) { - UINT16 wFormatNo; - AUDIO_FORMAT* format; - UINT32 dwAudioTimeStamp; + UINT16 wFormatNo = 0; + AUDIO_FORMAT* format = NULL; + UINT32 dwAudioTimeStamp = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 12)) return ERROR_BAD_LENGTH; @@ -743,7 +743,7 @@ static void rdpsnd_recv_close_pdu(rdpsndPlugin* rdpsnd) static UINT rdpsnd_recv_volume_pdu(rdpsndPlugin* rdpsnd, wStream* s) { BOOL rc = TRUE; - UINT32 dwVolume; + UINT32 dwVolume = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) return ERROR_BAD_LENGTH; @@ -772,8 +772,8 @@ static UINT rdpsnd_recv_volume_pdu(rdpsndPlugin* rdpsnd, wStream* s) */ static UINT rdpsnd_recv_pdu(rdpsndPlugin* rdpsnd, wStream* s) { - BYTE msgType; - UINT16 BodySize; + BYTE msgType = 0; + UINT16 BodySize = 0; UINT status = CHANNEL_RC_OK; if (rdpsnd->expectingWave) @@ -849,9 +849,9 @@ static void rdpsnd_register_device_plugin(rdpsndPlugin* rdpsnd, rdpsndDevicePlug static UINT rdpsnd_load_device_plugin(rdpsndPlugin* rdpsnd, const char* name, const ADDIN_ARGV* args) { - PFREERDP_RDPSND_DEVICE_ENTRY entry; + PFREERDP_RDPSND_DEVICE_ENTRY entry = NULL; FREERDP_RDPSND_DEVICE_ENTRY_POINTS entryPoints; - UINT error; + UINT error = 0; DWORD flags = FREERDP_ADDIN_CHANNEL_STATIC | FREERDP_ADDIN_CHANNEL_ENTRYEX; if (rdpsnd->dynamic) flags = FREERDP_ADDIN_CHANNEL_DYNAMIC; @@ -894,9 +894,9 @@ static BOOL rdpsnd_set_device_name(rdpsndPlugin* rdpsnd, const char* device_name */ static UINT rdpsnd_process_addin_args(rdpsndPlugin* rdpsnd, const ADDIN_ARGV* args) { - int status; - DWORD flags; - const COMMAND_LINE_ARGUMENT_A* arg; + int status = 0; + DWORD flags = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; COMMAND_LINE_ARGUMENT_A rdpsnd_args[] = { { "sys", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "subsystem" }, { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "device" }, @@ -1044,7 +1044,7 @@ static UINT rdpsnd_process_connect(rdpsndPlugin* rdpsnd) #endif { "fake", "" } }; - const ADDIN_ARGV* args; + const ADDIN_ARGV* args = NULL; UINT status = ERROR_INTERNAL_ERROR; WINPR_ASSERT(rdpsnd); rdpsnd->latency = 0; @@ -1070,7 +1070,7 @@ static UINT rdpsnd_process_connect(rdpsndPlugin* rdpsnd) } else { - size_t x; + size_t x = 0; for (x = 0; x < ARRAYSIZE(backends); x++) { @@ -1113,7 +1113,7 @@ UINT rdpsnd_virtual_channel_write(rdpsndPlugin* rdpsnd, wStream* s) { if (rdpsnd->dynamic) { - IWTSVirtualChannel* channel; + IWTSVirtualChannel* channel = NULL; if (rdpsnd->listener_callback) { channel = rdpsnd->listener_callback->channel_callback->channel; @@ -1247,7 +1247,7 @@ static VOID VCAPITYPE rdpsnd_virtual_channel_open_event_ex(LPVOID lpUserParam, D static UINT rdpsnd_virtual_channel_event_connected(rdpsndPlugin* rdpsnd, LPVOID pData, UINT32 dataLength) { - UINT32 status; + UINT32 status = 0; DWORD opened = 0; WINPR_UNUSED(pData); WINPR_UNUSED(dataLength); @@ -1302,7 +1302,7 @@ static void cleanup_internals(rdpsndPlugin* rdpsnd) */ static UINT rdpsnd_virtual_channel_event_disconnected(rdpsndPlugin* rdpsnd) { - UINT error; + UINT error = 0; WINPR_ASSERT(rdpsnd); WINPR_ASSERT(!rdpsnd->dynamic); @@ -1567,9 +1567,9 @@ fail: FREERDP_ENTRY_POINT(BOOL VCAPITYPE rdpsnd_VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, PVOID pInitHandle)) { - UINT rc; - rdpsndPlugin* rdpsnd; - CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx; + UINT rc = 0; + rdpsndPlugin* rdpsnd = NULL; + CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = NULL; if (!pEntryPoints) return FALSE; @@ -1615,7 +1615,7 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE rdpsnd_VirtualChannelEntryEx(PCHANNEL_ENTRY_P static UINT rdpsnd_on_open(IWTSVirtualChannelCallback* pChannelCallback) { GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; - rdpsndPlugin* rdpsnd; + rdpsndPlugin* rdpsnd = NULL; WINPR_ASSERT(callback); @@ -1635,9 +1635,9 @@ static UINT rdpsnd_on_open(IWTSVirtualChannelCallback* pChannelCallback) static UINT rdpsnd_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* data) { GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; - rdpsndPlugin* plugin; - wStream* copy; - size_t len; + rdpsndPlugin* plugin = NULL; + wStream* copy = NULL; + size_t len = 0; len = Stream_GetRemainingLength(data); @@ -1674,7 +1674,7 @@ static UINT rdpsnd_on_data_received(IWTSVirtualChannelCallback* pChannelCallback static UINT rdpsnd_on_close(IWTSVirtualChannelCallback* pChannelCallback) { GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; - rdpsndPlugin* rdpsnd; + rdpsndPlugin* rdpsnd = NULL; WINPR_ASSERT(callback); @@ -1703,7 +1703,7 @@ static UINT rdpsnd_on_new_channel_connection(IWTSListenerCallback* pListenerCall BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - GENERIC_CHANNEL_CALLBACK* callback; + GENERIC_CHANNEL_CALLBACK* callback = NULL; GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; WINPR_ASSERT(listener_callback); WINPR_ASSERT(pChannel); @@ -1732,7 +1732,7 @@ static UINT rdpsnd_on_new_channel_connection(IWTSListenerCallback* pListenerCall static UINT rdpsnd_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelManager* pChannelMgr) { - UINT status; + UINT status = 0; rdpsndPlugin* rdpsnd = (rdpsndPlugin*)pPlugin; WINPR_ASSERT(rdpsnd); WINPR_ASSERT(pChannelMgr); @@ -1799,7 +1799,7 @@ static UINT rdpsnd_plugin_terminated(IWTSPlugin* pPlugin) FREERDP_ENTRY_POINT(UINT rdpsnd_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)) { UINT error = CHANNEL_RC_OK; - rdpsndPlugin* rdpsnd; + rdpsndPlugin* rdpsnd = NULL; WINPR_ASSERT(pEntryPoints); WINPR_ASSERT(pEntryPoints->GetPlugin); @@ -1808,7 +1808,7 @@ FREERDP_ENTRY_POINT(UINT rdpsnd_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoin if (!rdpsnd) { - IWTSPlugin* iface; + IWTSPlugin* iface = NULL; union { const void* cev; diff --git a/channels/rdpsnd/server/rdpsnd_main.c b/channels/rdpsnd/server/rdpsnd_main.c index 59493fd6a..2959d6ef1 100644 --- a/channels/rdpsnd/server/rdpsnd_main.c +++ b/channels/rdpsnd/server/rdpsnd_main.c @@ -38,7 +38,7 @@ static wStream* rdpsnd_server_get_buffer(RdpsndServerContext* context) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -56,7 +56,7 @@ static UINT rdpsnd_server_send_formats(RdpsndServerContext* context) { wStream* s = rdpsnd_server_get_buffer(context); BOOL status = FALSE; - ULONG written; + ULONG written = 0; if (!Stream_EnsureRemainingCapacity(s, 24)) return ERROR_OUTOFMEMORY; @@ -101,8 +101,8 @@ fail: */ static UINT rdpsnd_server_recv_waveconfirm(RdpsndServerContext* context, wStream* s) { - UINT16 timestamp; - BYTE confirmBlockNum; + UINT16 timestamp = 0; + BYTE confirmBlockNum = 0; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(context); @@ -128,8 +128,8 @@ static UINT rdpsnd_server_recv_waveconfirm(RdpsndServerContext* context, wStream */ static UINT rdpsnd_server_recv_trainingconfirm(RdpsndServerContext* context, wStream* s) { - UINT16 timestamp; - UINT16 packsize; + UINT16 timestamp = 0; + UINT16 packsize = 0; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(context); @@ -177,10 +177,10 @@ static UINT rdpsnd_server_recv_quality_mode(RdpsndServerContext* context, wStrea */ static UINT rdpsnd_server_recv_formats(RdpsndServerContext* context, wStream* s) { - UINT16 i; + UINT16 i = 0; UINT16 num_known_format = 0; - UINT16 udpPort; - BYTE lastblock; + UINT16 udpPort = 0; + BYTE lastblock = 0; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(context); @@ -267,7 +267,7 @@ out_free: static DWORD WINAPI rdpsnd_server_thread(LPVOID arg) { DWORD nCount = 0; - DWORD status; + DWORD status = 0; HANDLE events[2] = { 0 }; RdpsndServerContext* context = (RdpsndServerContext*)arg; UINT error = CHANNEL_RC_OK; @@ -338,9 +338,9 @@ static UINT rdpsnd_server_initialize(RdpsndServerContext* context, BOOL ownThrea */ static UINT rdpsnd_server_select_format(RdpsndServerContext* context, UINT16 client_format_index) { - size_t bs; - size_t out_buffer_size; - AUDIO_FORMAT* format; + size_t bs = 0; + size_t out_buffer_size = 0; + AUDIO_FORMAT* format = NULL; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(context); @@ -400,7 +400,7 @@ static UINT rdpsnd_server_select_format(RdpsndServerContext* context, UINT16 cli if (context->priv->out_buffer_size < out_buffer_size) { - BYTE* newBuffer; + BYTE* newBuffer = NULL; newBuffer = (BYTE*)realloc(context->priv->out_buffer, out_buffer_size); if (!newBuffer) @@ -429,8 +429,8 @@ static UINT rdpsnd_server_training(RdpsndServerContext* context, UINT16 timestam BYTE* data) { size_t end = 0; - ULONG written; - BOOL status; + ULONG written = 0; + BOOL status = 0; wStream* s = rdpsnd_server_get_buffer(context); if (!Stream_EnsureRemainingCapacity(s, 8)) @@ -467,7 +467,7 @@ static UINT rdpsnd_server_training(RdpsndServerContext* context, UINT16 timestam static BOOL rdpsnd_server_align_wave_pdu(wStream* s, UINT32 alignment) { - size_t size; + size_t size = 0; Stream_SealLength(s); size = Stream_Length(s); @@ -493,12 +493,12 @@ static BOOL rdpsnd_server_align_wave_pdu(wStream* s, UINT32 alignment) */ static UINT rdpsnd_server_send_wave_pdu(RdpsndServerContext* context, UINT16 wTimestamp) { - size_t length; - size_t start; + size_t length = 0; + size_t start = 0; size_t end = 0; - const BYTE* src; - AUDIO_FORMAT* format; - ULONG written; + const BYTE* src = NULL; + AUDIO_FORMAT* format = NULL; + ULONG written = 0; UINT error = CHANNEL_RC_OK; wStream* s = rdpsnd_server_get_buffer(context); @@ -583,9 +583,9 @@ static UINT rdpsnd_server_send_wave2_pdu(RdpsndServerContext* context, UINT16 fo UINT16 timestamp, UINT32 audioTimeStamp) { size_t end = 0; - ULONG written; + ULONG written = 0; UINT error = CHANNEL_RC_OK; - BOOL status; + BOOL status = 0; wStream* s = rdpsnd_server_get_buffer(context); if (!Stream_EnsureRemainingCapacity(s, 16)) @@ -618,7 +618,7 @@ static UINT rdpsnd_server_send_wave2_pdu(RdpsndServerContext* context, UINT16 fo } else { - AUDIO_FORMAT* format; + AUDIO_FORMAT* format = NULL; if (!freerdp_dsp_encode(context->priv->dsp_context, context->src_format, data, size, s)) { @@ -659,8 +659,8 @@ out: /* Wrapper function to send WAVE or WAVE2 PDU depending on client connected */ static UINT rdpsnd_server_send_audio_pdu(RdpsndServerContext* context, UINT16 wTimestamp) { - const BYTE* src; - size_t length; + const BYTE* src = NULL; + size_t length = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -762,9 +762,9 @@ static UINT rdpsnd_server_send_samples2(RdpsndServerContext* context, UINT16 for */ static UINT rdpsnd_server_set_volume(RdpsndServerContext* context, UINT16 left, UINT16 right) { - size_t len; - BOOL status; - ULONG written; + size_t len = 0; + BOOL status = 0; + ULONG written = 0; wStream* s = rdpsnd_server_get_buffer(context); if (!Stream_EnsureRemainingCapacity(s, 8)) @@ -790,9 +790,9 @@ static UINT rdpsnd_server_set_volume(RdpsndServerContext* context, UINT16 left, */ static UINT rdpsnd_server_close(RdpsndServerContext* context) { - size_t pos; - BOOL status; - ULONG written; + size_t pos = 0; + BOOL status = 0; + ULONG written = 0; UINT error = CHANNEL_RC_OK; wStream* s = rdpsnd_server_get_buffer(context); @@ -842,8 +842,8 @@ static UINT rdpsnd_server_close(RdpsndServerContext* context) static UINT rdpsnd_server_start(RdpsndServerContext* context) { void* buffer = NULL; - DWORD bytesReturned; - RdpsndServerPrivate* priv; + DWORD bytesReturned = 0; + RdpsndServerPrivate* priv = NULL; UINT error = ERROR_INTERNAL_ERROR; PULONG pSessionId = NULL; @@ -855,7 +855,7 @@ static UINT rdpsnd_server_start(RdpsndServerContext* context) if (context->use_dynamic_virtual_channel) { - UINT32 channelId; + UINT32 channelId = 0; BOOL status = TRUE; if (WTSQuerySessionInformationA(context->vcm, WTS_CURRENT_SESSION, WTSSessionId, @@ -1025,7 +1025,7 @@ static UINT rdpsnd_server_stop(RdpsndServerContext* context) RdpsndServerContext* rdpsnd_server_context_new(HANDLE vcm) { - RdpsndServerPrivate* priv; + RdpsndServerPrivate* priv = NULL; RdpsndServerContext* context = (RdpsndServerContext*)calloc(1, sizeof(RdpsndServerContext)); if (!context) @@ -1137,10 +1137,10 @@ HANDLE rdpsnd_server_get_event_handle(RdpsndServerContext* context) */ UINT rdpsnd_server_handle_messages(RdpsndServerContext* context) { - DWORD bytesReturned; + DWORD bytesReturned = 0; UINT ret = CHANNEL_RC_OK; - RdpsndServerPrivate* priv; - wStream* s; + RdpsndServerPrivate* priv = NULL; + wStream* s = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); diff --git a/channels/remdesk/client/remdesk_main.c b/channels/remdesk/client/remdesk_main.c index 6fdb73a2f..c1a146d68 100644 --- a/channels/remdesk/client/remdesk_main.c +++ b/channels/remdesk/client/remdesk_main.c @@ -40,7 +40,7 @@ */ static UINT remdesk_virtual_channel_write(remdeskPlugin* remdesk, wStream* s) { - UINT32 status; + UINT32 status = 0; if (!remdesk) { @@ -69,10 +69,10 @@ static UINT remdesk_virtual_channel_write(remdeskPlugin* remdesk, wStream* s) */ static UINT remdesk_generate_expert_blob(remdeskPlugin* remdesk) { - char* name; - char* pass; - const char* password; - rdpSettings* settings; + char* name = NULL; + char* pass = NULL; + const char* password = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(remdesk); @@ -136,7 +136,7 @@ static UINT remdesk_generate_expert_blob(remdeskPlugin* remdesk) */ static UINT remdesk_read_channel_header(wStream* s, REMDESK_CHANNEL_HEADER* header) { - UINT32 ChannelNameLen; + UINT32 ChannelNameLen = 0; WINPR_ASSERT(s); WINPR_ASSERT(header); @@ -174,8 +174,8 @@ static UINT remdesk_read_channel_header(wStream* s, REMDESK_CHANNEL_HEADER* head */ static UINT remdesk_write_channel_header(wStream* s, REMDESK_CHANNEL_HEADER* header) { - int index; - UINT32 ChannelNameLen; + int index = 0; + UINT32 ChannelNameLen = 0; WCHAR ChannelNameW[32] = { 0 }; WINPR_ASSERT(s); @@ -248,8 +248,8 @@ static UINT remdesk_recv_ctl_server_announce_pdu(remdeskPlugin* remdesk, wStream static UINT remdesk_recv_ctl_version_info_pdu(remdeskPlugin* remdesk, wStream* s, REMDESK_CHANNEL_HEADER* header) { - UINT32 versionMajor; - UINT32 versionMinor; + UINT32 versionMajor = 0; + UINT32 versionMinor = 0; WINPR_ASSERT(remdesk); WINPR_ASSERT(s); @@ -278,9 +278,9 @@ static UINT remdesk_recv_ctl_version_info_pdu(remdeskPlugin* remdesk, wStream* s */ static UINT remdesk_send_ctl_version_info_pdu(remdeskPlugin* remdesk) { - wStream* s; + wStream* s = NULL; REMDESK_CTL_VERSION_INFO_PDU pdu; - UINT error; + UINT error = 0; WINPR_ASSERT(remdesk); @@ -314,7 +314,7 @@ static UINT remdesk_send_ctl_version_info_pdu(remdeskPlugin* remdesk) static UINT remdesk_recv_ctl_result_pdu(remdeskPlugin* remdesk, wStream* s, REMDESK_CHANNEL_HEADER* header, UINT32* pResult) { - UINT32 result; + UINT32 result = 0; WINPR_ASSERT(remdesk); WINPR_ASSERT(s); @@ -354,7 +354,7 @@ static UINT remdesk_send_ctl_authenticate_pdu(remdeskPlugin* remdesk) size_t cbRaConnectionStringW = 0; WCHAR* raConnectionStringW = NULL; REMDESK_CTL_AUTHENTICATE_PDU pdu = { 0 }; - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(remdesk); @@ -417,13 +417,13 @@ out: */ static UINT remdesk_send_ctl_remote_control_desktop_pdu(remdeskPlugin* remdesk) { - UINT error; - size_t length; + UINT error = 0; + size_t length = 0; wStream* s = NULL; size_t cbRaConnectionStringW = 0; WCHAR* raConnectionStringW = NULL; REMDESK_CTL_REMOTE_CONTROL_DESKTOP_PDU pdu = { 0 }; - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(remdesk); WINPR_ASSERT(remdesk->rdpcontext); @@ -470,7 +470,7 @@ out: static UINT remdesk_send_ctl_verify_password_pdu(remdeskPlugin* remdesk) { UINT error = ERROR_INTERNAL_ERROR; - wStream* s; + wStream* s = NULL; size_t cbExpertBlobW = 0; WCHAR* expertBlobW = NULL; REMDESK_CTL_VERIFY_PASSWORD_PDU pdu = { 0 }; @@ -520,8 +520,8 @@ out: */ static UINT remdesk_send_ctl_expert_on_vista_pdu(remdeskPlugin* remdesk) { - UINT error; - wStream* s; + UINT error = 0; + wStream* s = NULL; REMDESK_CTL_EXPERT_ON_VISTA_PDU pdu; WINPR_ASSERT(remdesk); @@ -684,7 +684,7 @@ static UINT remdesk_recv_ctl_pdu(remdeskPlugin* remdesk, wStream* s, REMDESK_CHA */ static UINT remdesk_process_receive(remdeskPlugin* remdesk, wStream* s) { - UINT status; + UINT status = 0; REMDESK_CHANNEL_HEADER header; WINPR_ASSERT(remdesk); @@ -741,7 +741,7 @@ static UINT remdesk_virtual_channel_event_data_received(remdeskPlugin* remdesk, UINT32 dataLength, UINT32 totalLength, UINT32 dataFlags) { - wStream* data_in; + wStream* data_in = NULL; WINPR_ASSERT(remdesk); @@ -907,7 +907,7 @@ static DWORD WINAPI remdesk_virtual_channel_client_thread(LPVOID arg) static UINT remdesk_virtual_channel_event_connected(remdeskPlugin* remdesk, LPVOID pData, UINT32 dataLength) { - UINT error; + UINT error = 0; WINPR_ASSERT(remdesk); @@ -1045,10 +1045,10 @@ static VOID VCAPITYPE remdesk_virtual_channel_init_event_ex(LPVOID lpUserParam, FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, PVOID pInitHandle)) { - UINT rc; - remdeskPlugin* remdesk; + UINT rc = 0; + remdeskPlugin* remdesk = NULL; RemdeskClientContext* context = NULL; - CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx; + CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = NULL; if (!pEntryPoints) { diff --git a/channels/remdesk/server/remdesk_main.c b/channels/remdesk/server/remdesk_main.c index 63272c685..e95fb742b 100644 --- a/channels/remdesk/server/remdesk_main.c +++ b/channels/remdesk/server/remdesk_main.c @@ -36,7 +36,7 @@ */ static UINT remdesk_virtual_channel_write(RemdeskServerContext* context, wStream* s) { - BOOL status; + BOOL status = 0; ULONG BytesWritten = 0; status = WTSVirtualChannelWrite(context->priv->ChannelHandle, (PCHAR)Stream_Buffer(s), Stream_Length(s), &BytesWritten); @@ -50,7 +50,7 @@ static UINT remdesk_virtual_channel_write(RemdeskServerContext* context, wStream */ static UINT remdesk_read_channel_header(wStream* s, REMDESK_CHANNEL_HEADER* header) { - UINT32 ChannelNameLen; + UINT32 ChannelNameLen = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) return CHANNEL_RC_NO_MEMORY; @@ -85,8 +85,8 @@ static UINT remdesk_read_channel_header(wStream* s, REMDESK_CHANNEL_HEADER* head */ static UINT remdesk_write_channel_header(wStream* s, REMDESK_CHANNEL_HEADER* header) { - int index; - UINT32 ChannelNameLen; + int index = 0; + UINT32 ChannelNameLen = 0; WCHAR ChannelNameW[32] = { 0 }; for (index = 0; index < 32; index++) @@ -108,7 +108,7 @@ static UINT remdesk_write_channel_header(wStream* s, REMDESK_CHANNEL_HEADER* hea */ static UINT remdesk_write_ctl_header(wStream* s, REMDESK_CTL_HEADER* ctlHeader) { - UINT error; + UINT error = 0; if ((error = remdesk_write_channel_header(s, (REMDESK_CHANNEL_HEADER*)ctlHeader))) { @@ -142,9 +142,9 @@ static UINT remdesk_prepare_ctl_header(REMDESK_CTL_HEADER* ctlHeader, UINT32 msg */ static UINT remdesk_send_ctl_result_pdu(RemdeskServerContext* context, UINT32 result) { - wStream* s; + wStream* s = NULL; REMDESK_CTL_RESULT_PDU pdu; - UINT error; + UINT error = 0; pdu.result = result; if ((error = remdesk_prepare_ctl_header(&(pdu.ctlHeader), REMDESK_CTL_RESULT, 4))) @@ -185,9 +185,9 @@ out: */ static UINT remdesk_send_ctl_version_info_pdu(RemdeskServerContext* context) { - wStream* s; + wStream* s = NULL; REMDESK_CTL_VERSION_INFO_PDU pdu; - UINT error; + UINT error = 0; if ((error = remdesk_prepare_ctl_header(&(pdu.ctlHeader), REMDESK_CTL_VERSIONINFO, 8))) { @@ -231,8 +231,8 @@ out: static UINT remdesk_recv_ctl_version_info_pdu(RemdeskServerContext* context, wStream* s, REMDESK_CHANNEL_HEADER* header) { - UINT32 versionMajor; - UINT32 versionMinor; + UINT32 versionMajor = 0; + UINT32 versionMinor = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) return ERROR_INVALID_DATA; @@ -362,7 +362,7 @@ static UINT remdesk_recv_ctl_verify_password_pdu(RemdeskServerContext* context, { SSIZE_T cbExpertBlobW = 0; REMDESK_CTL_VERIFY_PASSWORD_PDU pdu; - UINT error; + UINT error = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) return ERROR_INVALID_DATA; @@ -522,17 +522,17 @@ static UINT remdesk_server_receive_pdu(RemdeskServerContext* context, wStream* s static DWORD WINAPI remdesk_server_thread(LPVOID arg) { - wStream* s; - DWORD status; - DWORD nCount; - void* buffer; - UINT32* pHeader; - UINT32 PduLength; + wStream* s = NULL; + DWORD status = 0; + DWORD nCount = 0; + void* buffer = NULL; + UINT32* pHeader = NULL; + UINT32 PduLength = 0; HANDLE events[8]; - HANDLE ChannelEvent; - DWORD BytesReturned; - RemdeskServerContext* context; - UINT error; + HANDLE ChannelEvent = NULL; + DWORD BytesReturned = 0; + RemdeskServerContext* context = NULL; + UINT error = 0; context = (RemdeskServerContext*)arg; buffer = NULL; BytesReturned = 0; @@ -685,7 +685,7 @@ static UINT remdesk_server_start(RemdeskServerContext* context) */ static UINT remdesk_server_stop(RemdeskServerContext* context) { - UINT error; + UINT error = 0; SetEvent(context->priv->StopEvent); if (WaitForSingleObject(context->priv->Thread, INFINITE) == WAIT_FAILED) @@ -702,7 +702,7 @@ static UINT remdesk_server_stop(RemdeskServerContext* context) RemdeskServerContext* remdesk_server_context_new(HANDLE vcm) { - RemdeskServerContext* context; + RemdeskServerContext* context = NULL; context = (RemdeskServerContext*)calloc(1, sizeof(RemdeskServerContext)); if (context) diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c index e5e81d331..58f61b90a 100644 --- a/channels/serial/client/serial_main.c +++ b/channels/serial/client/serial_main.c @@ -121,10 +121,10 @@ static UINT32 _GetLastErrorToIoStatus(SERIAL_DEVICE* serial) static UINT serial_process_irp_create(SERIAL_DEVICE* serial, IRP* irp) { - DWORD DesiredAccess; - DWORD SharedAccess; - DWORD CreateDisposition; - UINT32 PathLength; + DWORD DesiredAccess = 0; + DWORD SharedAccess = 0; + DWORD CreateDisposition = 0; + UINT32 PathLength = 0; if (!Stream_CheckAndLogRequiredLength(TAG, irp->input, 32)) return ERROR_INVALID_DATA; @@ -231,8 +231,8 @@ error_handle: */ static UINT serial_process_irp_read(SERIAL_DEVICE* serial, IRP* irp) { - UINT32 Length; - UINT64 Offset; + UINT32 Length = 0; + UINT64 Offset = 0; BYTE* buffer = NULL; DWORD nbRead = 0; @@ -292,8 +292,8 @@ error_handle: static UINT serial_process_irp_write(SERIAL_DEVICE* serial, IRP* irp) { - UINT32 Length; - UINT64 Offset; + UINT32 Length = 0; + UINT64 Offset = 0; DWORD nbWritten = 0; if (!Stream_CheckAndLogRequiredLength(TAG, irp->input, 32)) @@ -343,10 +343,10 @@ static UINT serial_process_irp_write(SERIAL_DEVICE* serial, IRP* irp) */ static UINT serial_process_irp_device_control(SERIAL_DEVICE* serial, IRP* irp) { - UINT32 IoControlCode; - UINT32 InputBufferLength; + UINT32 IoControlCode = 0; + UINT32 InputBufferLength = 0; BYTE* InputBuffer = NULL; - UINT32 OutputBufferLength; + UINT32 OutputBufferLength = 0; BYTE* OutputBuffer = NULL; DWORD BytesReturned = 0; @@ -482,7 +482,7 @@ static UINT serial_process_irp(SERIAL_DEVICE* serial, IRP* irp) static DWORD WINAPI irp_thread_func(LPVOID arg) { IRP_THREAD_DATA* data = (IRP_THREAD_DATA*)arg; - UINT error; + UINT error = 0; /* blocks until the end of the request */ if ((error = serial_process_irp(data->serial, data->irp))) @@ -511,9 +511,9 @@ error_out: static void create_irp_thread(SERIAL_DEVICE* serial, IRP* irp) { IRP_THREAD_DATA* data = NULL; - HANDLE irpThread; - HANDLE previousIrpThread; - uintptr_t key; + HANDLE irpThread = NULL; + HANDLE previousIrpThread = NULL; + uintptr_t key = 0; /* for a test/debug purpose, uncomment the code below to get a * single thread for all IRPs. NB: two IRPs could not be * processed at the same time, typically two concurent @@ -530,14 +530,14 @@ static void create_irp_thread(SERIAL_DEVICE* serial, IRP* irp) { /* Cleaning up termitating and pending irp * threads. See also: irp_thread_func() */ - HANDLE cirpThread; + HANDLE cirpThread = NULL; ULONG_PTR* ids = NULL; const size_t nbIds = ListDictionary_GetKeys(serial->IrpThreads, &ids); for (size_t i = 0; i < nbIds; i++) { /* Checking if ids[i] is terminating or pending */ - DWORD waitResult; + DWORD waitResult = 0; ULONG_PTR id = ids[i]; cirpThread = ListDictionary_GetItemValue(serial->IrpThreads, (void*)id); /* FIXME: not quite sure a zero timeout is a good thing to check whether a thread is @@ -671,7 +671,7 @@ static void terminate_pending_irp_threads(SERIAL_DEVICE* serial) for (size_t i = 0; i < nbIds; i++) { - HANDLE irpThread; + HANDLE irpThread = NULL; ULONG_PTR id = ids[i]; irpThread = ListDictionary_GetItemValue(serial->IrpThreads, (void*)id); TerminateThread(irpThread, 0); @@ -765,7 +765,7 @@ static UINT serial_irp_request(DEVICE* device, IRP* irp) */ static UINT serial_free(DEVICE* device) { - UINT error; + UINT error = 0; SERIAL_DEVICE* serial = (SERIAL_DEVICE*)device; WLog_Print(serial->log, WLOG_DEBUG, "freeing"); MessageQueue_PostQuit(serial->MainIrpQueue, 0); @@ -815,14 +815,14 @@ static void serial_message_free(void* obj) */ FREERDP_ENTRY_POINT(UINT serial_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)) { - char* name; - char* path; - char* driver; - RDPDR_SERIAL* device; + char* name = NULL; + char* path = NULL; + char* driver = NULL; + RDPDR_SERIAL* device = NULL; #if defined __linux__ && !defined ANDROID - size_t i; - size_t len; - SERIAL_DEVICE* serial; + size_t i = 0; + size_t len = 0; + SERIAL_DEVICE* serial = NULL; #endif /* __linux__ */ UINT error = CHANNEL_RC_OK; @@ -843,7 +843,7 @@ FREERDP_ENTRY_POINT(UINT serial_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS if ((name && name[0]) && (path && path[0])) { - wLog* log; + wLog* log = NULL; log = WLog_Get("com.freerdp.channel.serial.client"); WLog_Print(log, WLOG_DEBUG, "initializing"); #ifndef __linux__ /* to be removed */ diff --git a/channels/server/channels.c b/channels/server/channels.c index be1d82ac2..35a85e8ee 100644 --- a/channels/server/channels.c +++ b/channels/server/channels.c @@ -80,29 +80,29 @@ extern void freerdp_channels_dummy(void); void freerdp_channels_dummy(void) { #if defined(CHANNEL_AUDIN_SERVER) - audin_server_context* audin; + audin_server_context* audin = NULL; #endif - RdpsndServerContext* rdpsnd; - CliprdrServerContext* cliprdr; - echo_server_context* echo; - RdpdrServerContext* rdpdr; - DrdynvcServerContext* drdynvc; - RdpeiServerContext* rdpei; - RemdeskServerContext* remdesk; - EncomspServerContext* encomsp; - RailServerContext* rail; - TelemetryServerContext* telemetry; - RdpgfxServerContext* rdpgfx; - DispServerContext* disp; + RdpsndServerContext* rdpsnd = NULL; + CliprdrServerContext* cliprdr = NULL; + echo_server_context* echo = NULL; + RdpdrServerContext* rdpdr = NULL; + DrdynvcServerContext* drdynvc = NULL; + RdpeiServerContext* rdpei = NULL; + RemdeskServerContext* remdesk = NULL; + EncomspServerContext* encomsp = NULL; + RailServerContext* rail = NULL; + TelemetryServerContext* telemetry = NULL; + RdpgfxServerContext* rdpgfx = NULL; + DispServerContext* disp = NULL; #if defined(CHANNEL_RDPEMSC_SERVER) - MouseCursorServerContext* mouse_cursor; + MouseCursorServerContext* mouse_cursor = NULL; #endif /* CHANNEL_RDPEMSC_SERVER */ #if defined(CHANNEL_RDPECAM_SERVER) - CamDevEnumServerContext* camera_enumerator; - CameraDeviceServerContext* camera_device; + CamDevEnumServerContext* camera_enumerator = NULL; + CameraDeviceServerContext* camera_device = NULL; #endif #if defined(CHANNEL_LOCATION_SERVER) - LocationServerContext* location; + LocationServerContext* location = NULL; #endif /* CHANNEL_LOCATION_SERVER */ #ifdef WITH_CHANNEL_GFXREDIR GfxRedirServerContext* gfxredir; diff --git a/channels/smartcard/client/smartcard_main.c b/channels/smartcard/client/smartcard_main.c index 55d5482fa..0037b4e6a 100644 --- a/channels/smartcard/client/smartcard_main.c +++ b/channels/smartcard/client/smartcard_main.c @@ -108,7 +108,7 @@ static DWORD WINAPI smartcard_context_thread(LPVOID arg) if (waitStatus == WAIT_OBJECT_0) { - scard_irp_queue_element* element; + scard_irp_queue_element* element = NULL; if (!MessageQueue_Peek(pContext->IrpQueue, &message, TRUE)) { @@ -178,7 +178,7 @@ static void smartcard_operation_queue_free(void* obj) static void* smartcard_context_new(void* smartcard, SCARDCONTEXT hContext) { - SMARTCARD_CONTEXT* pContext; + SMARTCARD_CONTEXT* pContext = NULL; pContext = (SMARTCARD_CONTEXT*)calloc(1, sizeof(SMARTCARD_CONTEXT)); if (!pContext) @@ -353,7 +353,7 @@ UINT smartcard_complete_irp(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL* handled */ static UINT smartcard_process_irp(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL* handled) { - LONG status; + LONG status = 0; BOOL asyncIrp = FALSE; SMARTCARD_CONTEXT* pContext = NULL; @@ -384,7 +384,7 @@ static UINT smartcard_process_irp(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL* h if (status != SCARD_S_SUCCESS) { - UINT error; + UINT error = 0; smartcard_operation_free(&element->operation, TRUE); irp->IoStatus = (UINT32)STATUS_UNSUCCESSFUL; @@ -464,7 +464,7 @@ static UINT smartcard_process_irp(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL* h if (!asyncIrp) { - UINT error; + UINT error = 0; status = smartcard_irp_device_control_call(smartcard->callctx, element->irp->output, @@ -500,7 +500,7 @@ static UINT smartcard_process_irp(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL* h } else { - UINT ustatus; + UINT ustatus = 0; WLog_ERR(TAG, "Unexpected SmartCard IRP: MajorFunction %s, MinorFunction: 0x%08" PRIX32 "", rdpdr_irp_string(irp->MajorFunction), irp->MinorFunction); irp->IoStatus = (UINT32)STATUS_NOT_SUPPORTED; @@ -629,7 +629,7 @@ extern UINT DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints); UINT DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) { SMARTCARD_DEVICE* smartcard = NULL; - size_t length; + size_t length = 0; UINT error = CHANNEL_RC_NO_MEMORY; if (!sSmartcard) diff --git a/channels/telemetry/server/telemetry_main.c b/channels/telemetry/server/telemetry_main.c index 83251e96d..0d8e0476c 100644 --- a/channels/telemetry/server/telemetry_main.c +++ b/channels/telemetry/server/telemetry_main.c @@ -74,10 +74,10 @@ static UINT telemetry_server_open_channel(telemetry_server* telemetry) { TelemetryServerContext* context = &telemetry->context; DWORD Error = ERROR_SUCCESS; - HANDLE hEvent; + HANDLE hEvent = NULL; DWORD BytesReturned = 0; PULONG pSessionId = NULL; - UINT32 channelId; + UINT32 channelId = 0; BOOL status = TRUE; WINPR_ASSERT(telemetry); @@ -143,12 +143,12 @@ static UINT telemetry_server_recv_rdp_telemetry_pdu(TelemetryServerContext* cont static UINT telemetry_process_message(telemetry_server* telemetry) { - BOOL rc; + BOOL rc = 0; UINT error = ERROR_INTERNAL_ERROR; - ULONG BytesReturned; - BYTE MessageId; - BYTE Length; - wStream* s; + ULONG BytesReturned = 0; + BYTE MessageId = 0; + BYTE Length = 0; + wStream* s = NULL; WINPR_ASSERT(telemetry); WINPR_ASSERT(telemetry->telemetry_channel); @@ -252,11 +252,11 @@ static HANDLE telemetry_server_get_channel_handle(telemetry_server* telemetry) static DWORD WINAPI telemetry_server_thread_func(LPVOID arg) { - DWORD nCount; + DWORD nCount = 0; HANDLE events[2] = { 0 }; telemetry_server* telemetry = (telemetry_server*)arg; UINT error = CHANNEL_RC_OK; - DWORD status; + DWORD status = 0; WINPR_ASSERT(telemetry); diff --git a/channels/tsmf/client/alsa/tsmf_alsa.c b/channels/tsmf/client/alsa/tsmf_alsa.c index c1fd287e9..fcf30aa13 100644 --- a/channels/tsmf/client/alsa/tsmf_alsa.c +++ b/channels/tsmf/client/alsa/tsmf_alsa.c @@ -48,7 +48,7 @@ typedef struct static BOOL tsmf_alsa_open_device(TSMFAlsaAudioDevice* alsa) { - int error; + int error = 0; error = snd_pcm_open(&alsa->out_handle, alsa->device, SND_PCM_STREAM_PLAYBACK, 0); if (error < 0) @@ -80,10 +80,10 @@ static BOOL tsmf_alsa_open(ITSMFAudioDevice* audio, const char* device) static BOOL tsmf_alsa_set_format(ITSMFAudioDevice* audio, UINT32 sample_rate, UINT32 channels, UINT32 bits_per_sample) { - int error; - snd_pcm_uframes_t frames; - snd_pcm_hw_params_t* hw_params; - snd_pcm_sw_params_t* sw_params; + int error = 0; + snd_pcm_uframes_t frames = 0; + snd_pcm_hw_params_t* hw_params = NULL; + snd_pcm_sw_params_t* sw_params = NULL; TSMFAlsaAudioDevice* alsa = (TSMFAlsaAudioDevice*)audio; if (!alsa->out_handle) @@ -141,13 +141,13 @@ static BOOL tsmf_alsa_set_format(ITSMFAudioDevice* audio, UINT32 sample_rate, UI static BOOL tsmf_alsa_play(ITSMFAudioDevice* audio, const BYTE* src, UINT32 data_size) { - int len; - int error; - int frames; - const BYTE* end; - const BYTE* pindex; - int rbytes_per_frame; - int sbytes_per_frame; + int len = 0; + int error = 0; + int frames = 0; + const BYTE* end = NULL; + const BYTE* pindex = NULL; + int rbytes_per_frame = 0; + int sbytes_per_frame = 0; TSMFAlsaAudioDevice* alsa = (TSMFAlsaAudioDevice*)audio; DEBUG_TSMF("data_size %" PRIu32 "", data_size); diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c index 1fe01a826..dc0e848af 100644 --- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c @@ -153,9 +153,9 @@ static BOOL tsmf_ffmpeg_init_audio_stream(ITSMFDecoder* decoder, const TS_AM_MED static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYPE* media_type) { - BYTE* p; - UINT32 size; - const BYTE* s; + BYTE* p = NULL; + UINT32 size = 0; + const BYTE* s = NULL; TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*)decoder; mdecoder->codec = avcodec_find_decoder(mdecoder->codec_id); @@ -364,9 +364,9 @@ static BOOL tsmf_ffmpeg_decode_video(ITSMFDecoder* decoder, const BYTE* data, UI UINT32 extensions) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*)decoder; - int decoded; - int len; - AVFrame* frame; + int decoded = 0; + int len = 0; + AVFrame* frame = NULL; BOOL ret = TRUE; #if LIBAVCODEC_VERSION_MAJOR < 52 || \ (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR <= 20) @@ -443,12 +443,12 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UI UINT32 extensions) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*)decoder; - int len; - int frame_size; - UINT32 src_size; - const BYTE* src; - BYTE* dst; - int dst_offset; + int len = 0; + int frame_size = 0; + UINT32 src_size = 0; + const BYTE* src = NULL; + BYTE* dst = NULL; + int dst_offset = 0; #if 0 WLog_DBG(TAG, ("tsmf_ffmpeg_decode_audio: data_size %"PRIu32"", data_size)); int i; @@ -482,7 +482,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UI /* Ensure enough space for decoding */ if (mdecoder->decoded_size_max - mdecoder->decoded_size < MAX_AUDIO_FRAME_SIZE) { - BYTE* tmp_data; + BYTE* tmp_data = NULL; tmp_data = realloc(mdecoder->decoded_data, mdecoder->decoded_size_max * 2 + 16); if (!tmp_data) @@ -606,7 +606,7 @@ static BOOL tsmf_ffmpeg_decode(ITSMFDecoder* decoder, const BYTE* data, UINT32 d static BYTE* tsmf_ffmpeg_get_decoded_data(ITSMFDecoder* decoder, UINT32* size) { - BYTE* buf; + BYTE* buf = NULL; TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*)decoder; *size = mdecoder->decoded_size; buf = mdecoder->decoded_data; @@ -678,7 +678,7 @@ static BOOL CALLBACK InitializeAvCodecs(PINIT_ONCE once, PVOID param, PVOID* con FREERDP_ENTRY_POINT(ITSMFDecoder* ffmpeg_freerdp_tsmf_client_decoder_subsystem_entry(void)) { - TSMFFFmpegDecoder* decoder; + TSMFFFmpegDecoder* decoder = NULL; InitOnceExecuteOnce(&g_Initialized, InitializeAvCodecs, NULL, NULL); WLog_DBG(TAG, "TSMFDecoderEntry FFMPEG"); decoder = (TSMFFFmpegDecoder*)calloc(1, sizeof(TSMFFFmpegDecoder)); diff --git a/channels/tsmf/client/oss/tsmf_oss.c b/channels/tsmf/client/oss/tsmf_oss.c index 76a0abaf0..666b41935 100644 --- a/channels/tsmf/client/oss/tsmf_oss.c +++ b/channels/tsmf/client/oss/tsmf_oss.c @@ -131,7 +131,7 @@ static BOOL tsmf_oss_open(ITSMFAudioDevice* audio, const char* device) static BOOL tsmf_oss_set_format(ITSMFAudioDevice* audio, UINT32 sample_rate, UINT32 channels, UINT32 bits_per_sample) { - int tmp; + int tmp = 0; TSMFOssAudioDevice* oss = (TSMFOssAudioDevice*)audio; if (oss == NULL || oss->pcm_handle == -1) @@ -167,8 +167,8 @@ static BOOL tsmf_oss_set_format(ITSMFAudioDevice* audio, UINT32 sample_rate, UIN static BOOL tsmf_oss_play(ITSMFAudioDevice* audio, const BYTE* data, UINT32 data_size) { - int status; - UINT32 offset; + int status = 0; + UINT32 offset = 0; TSMFOssAudioDevice* oss = (TSMFOssAudioDevice*)audio; DEBUG_TSMF("tsmf_oss_play: data_size %" PRIu32 "", data_size); diff --git a/channels/tsmf/client/pulse/tsmf_pulse.c b/channels/tsmf/client/pulse/tsmf_pulse.c index 1be6edf22..6d3cb1ca2 100644 --- a/channels/tsmf/client/pulse/tsmf_pulse.c +++ b/channels/tsmf/client/pulse/tsmf_pulse.c @@ -44,8 +44,7 @@ typedef struct static void tsmf_pulse_context_state_callback(pa_context* context, void* userdata) { TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*)userdata; - pa_context_state_t state; - state = pa_context_get_state(context); + pa_context_state_t state = pa_context_get_state(context); switch (state) { @@ -68,7 +67,7 @@ static void tsmf_pulse_context_state_callback(pa_context* context, void* userdat static BOOL tsmf_pulse_connect(TSMFPulseAudioDevice* pulse) { - pa_context_state_t state; + pa_context_state_t state = PA_CONTEXT_FAILED; if (!pulse->context) return FALSE; @@ -177,8 +176,7 @@ static void tsmf_pulse_wait_for_operation(TSMFPulseAudioDevice* pulse, pa_operat static void tsmf_pulse_stream_state_callback(pa_stream* stream, void* userdata) { TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*)userdata; - pa_stream_state_t state; - state = pa_stream_get_state(stream); + pa_stream_state_t state = pa_stream_get_state(stream); switch (state) { @@ -225,7 +223,7 @@ static BOOL tsmf_pulse_close_stream(TSMFPulseAudioDevice* pulse) static BOOL tsmf_pulse_open_stream(TSMFPulseAudioDevice* pulse) { - pa_stream_state_t state; + pa_stream_state_t state = PA_STREAM_FAILED; pa_buffer_attr buffer_attr = { 0 }; if (!pulse->context) @@ -305,9 +303,9 @@ static BOOL tsmf_pulse_set_format(ITSMFAudioDevice* audio, UINT32 sample_rate, U static BOOL tsmf_pulse_play(ITSMFAudioDevice* audio, const BYTE* data, UINT32 data_size) { TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*)audio; - const BYTE* src; - size_t len; - int ret; + const BYTE* src = NULL; + size_t len = 0; + int ret = 0; DEBUG_TSMF("data_size %" PRIu32 "", data_size); if (pulse->stream) @@ -349,7 +347,7 @@ static BOOL tsmf_pulse_play(ITSMFAudioDevice* audio, const BYTE* data, UINT32 da static UINT64 tsmf_pulse_get_latency(ITSMFAudioDevice* audio) { - pa_usec_t usec; + pa_usec_t usec = 0; UINT64 latency = 0; TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*)audio; @@ -400,7 +398,7 @@ static void tsmf_pulse_free(ITSMFAudioDevice* audio) FREERDP_ENTRY_POINT(ITSMFAudioDevice* pulse_freerdp_tsmf_client_audio_subsystem_entry(void)) { - TSMFPulseAudioDevice* pulse; + TSMFPulseAudioDevice* pulse = NULL; pulse = (TSMFPulseAudioDevice*)calloc(1, sizeof(TSMFPulseAudioDevice)); if (!pulse) diff --git a/channels/tsmf/client/tsmf_audio.c b/channels/tsmf/client/tsmf_audio.c index 6ec35fe04..89202ef7d 100644 --- a/channels/tsmf/client/tsmf_audio.c +++ b/channels/tsmf/client/tsmf_audio.c @@ -27,8 +27,8 @@ static ITSMFAudioDevice* tsmf_load_audio_device_by_name(const char* name, const char* device) { - ITSMFAudioDevice* audio; - TSMF_AUDIO_DEVICE_ENTRY entry; + ITSMFAudioDevice* audio = NULL; + TSMF_AUDIO_DEVICE_ENTRY entry = NULL; entry = (TSMF_AUDIO_DEVICE_ENTRY)(void*)freerdp_load_channel_addin_entry("tsmf", name, "audio", 0); diff --git a/channels/tsmf/client/tsmf_codec.c b/channels/tsmf/client/tsmf_codec.c index 75c0d9b8f..8143527b9 100644 --- a/channels/tsmf/client/tsmf_codec.c +++ b/channels/tsmf/client/tsmf_codec.c @@ -269,9 +269,9 @@ static void tsmf_print_guid(const BYTE* guid) static UINT32 tsmf_codec_parse_BITMAPINFOHEADER(TS_AM_MEDIA_TYPE* mediatype, wStream* s, BOOL bypass) { - UINT32 biSize; - UINT32 biWidth; - UINT32 biHeight; + UINT32 biSize = 0; + UINT32 biWidth = 0; + UINT32 biHeight = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 40)) return 0; @@ -302,7 +302,7 @@ static UINT32 tsmf_codec_parse_BITMAPINFOHEADER(TS_AM_MEDIA_TYPE* mediatype, wSt /* http://msdn.microsoft.com/en-us/library/dd407326.aspx */ static UINT32 tsmf_codec_parse_VIDEOINFOHEADER2(TS_AM_MEDIA_TYPE* mediatype, wStream* s) { - UINT64 AvgTimePerFrame; + UINT64 AvgTimePerFrame = 0; /* VIDEOINFOHEADER2.rcSource, RECT(LONG left, LONG top, LONG right, LONG bottom) */ if (!Stream_CheckAndLogRequiredLength(TAG, s, 72)) @@ -340,7 +340,7 @@ static UINT32 tsmf_codec_parse_VIDEOINFOHEADER(TS_AM_MEDIA_TYPE* mediatype, wStr BITMAPINFOHEADER bmiHeader; } VIDEOINFOHEADER; */ - UINT64 AvgTimePerFrame; + UINT64 AvgTimePerFrame = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 48)) return 0; @@ -365,8 +365,8 @@ static UINT32 tsmf_codec_parse_VIDEOINFOHEADER(TS_AM_MEDIA_TYPE* mediatype, wStr static BOOL tsmf_read_format_type(TS_AM_MEDIA_TYPE* mediatype, wStream* s, UINT32 cbFormat) { - UINT32 i; - UINT32 j; + UINT32 i = 0; + UINT32 j = 0; switch (mediatype->FormatType) { @@ -486,9 +486,9 @@ static BOOL tsmf_read_format_type(TS_AM_MEDIA_TYPE* mediatype, wStream* s, UINT3 BOOL tsmf_codec_parse_media_type(TS_AM_MEDIA_TYPE* mediatype, wStream* s) { - UINT32 cbFormat; + UINT32 cbFormat = 0; BOOL ret = TRUE; - int i; + int i = 0; ZeroMemory(mediatype, sizeof(TS_AM_MEDIA_TYPE)); @@ -576,7 +576,7 @@ BOOL tsmf_codec_parse_media_type(TS_AM_MEDIA_TYPE* mediatype, wStream* s) BOOL tsmf_codec_check_media_type(const char* decoder_name, wStream* s) { - size_t pos; + size_t pos = 0; BOOL ret = FALSE; TS_AM_MEDIA_TYPE mediatype; diff --git a/channels/tsmf/client/tsmf_decoder.c b/channels/tsmf/client/tsmf_decoder.c index 63492318c..0e318f7ea 100644 --- a/channels/tsmf/client/tsmf_decoder.c +++ b/channels/tsmf/client/tsmf_decoder.c @@ -32,8 +32,8 @@ static ITSMFDecoder* tsmf_load_decoder_by_name(const char* name) { - ITSMFDecoder* decoder; - TSMF_DECODER_ENTRY entry; + ITSMFDecoder* decoder = NULL; + TSMF_DECODER_ENTRY entry = NULL; entry = (TSMF_DECODER_ENTRY)(void*)freerdp_load_channel_addin_entry("tsmf", name, "decoder", 0); diff --git a/channels/tsmf/client/tsmf_ifman.c b/channels/tsmf/client/tsmf_ifman.c index b0d17c7e8..53af3b64f 100644 --- a/channels/tsmf/client/tsmf_ifman.c +++ b/channels/tsmf/client/tsmf_ifman.c @@ -22,6 +22,7 @@ #include +#include #include #include #include @@ -44,7 +45,7 @@ */ UINT tsmf_ifman_rim_exchange_capability_request(TSMF_IFMAN* ifman) { - UINT32 CapabilityValue; + UINT32 CapabilityValue = 0; if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, 4)) return ERROR_INVALID_DATA; @@ -144,8 +145,8 @@ UINT tsmf_ifman_exchange_capability_request(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_check_format_support_request(TSMF_IFMAN* ifman) { - UINT32 numMediaType; - UINT32 PlatformCookie; + UINT32 numMediaType = 0; + UINT32 PlatformCookie = 0; UINT32 FormatSupported = 1; if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, 12)) @@ -180,7 +181,7 @@ UINT tsmf_ifman_check_format_support_request(TSMF_IFMAN* ifman) UINT tsmf_ifman_on_new_presentation(TSMF_IFMAN* ifman) { UINT status = CHANNEL_RC_OK; - TSMF_PRESENTATION* presentation; + TSMF_PRESENTATION* presentation = NULL; DEBUG_TSMF(""); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, GUID_SIZE)) @@ -213,10 +214,10 @@ UINT tsmf_ifman_on_new_presentation(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_add_stream(TSMF_IFMAN* ifman, rdpContext* rdpcontext) { - UINT32 StreamId; + UINT32 StreamId = 0; UINT status = CHANNEL_RC_OK; - TSMF_STREAM* stream; - TSMF_PRESENTATION* presentation; + TSMF_STREAM* stream = NULL; + TSMF_PRESENTATION* presentation = NULL; DEBUG_TSMF(""); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, GUID_SIZE + 8)) @@ -281,9 +282,9 @@ UINT tsmf_ifman_set_topology_request(TSMF_IFMAN* ifman) UINT tsmf_ifman_remove_stream(TSMF_IFMAN* ifman) { int status = CHANNEL_RC_OK; - UINT32 StreamId; - TSMF_STREAM* stream; - TSMF_PRESENTATION* presentation; + UINT32 StreamId = 0; + TSMF_STREAM* stream = NULL; + TSMF_PRESENTATION* presentation = NULL; DEBUG_TSMF(""); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, 20)) @@ -313,8 +314,8 @@ UINT tsmf_ifman_remove_stream(TSMF_IFMAN* ifman) static float tsmf_stream_read_float(wStream* s) { - float fValue; - UINT32 iValue; + float fValue = NAN; + UINT32 iValue = 0; Stream_Read_UINT32(s, iValue); CopyMemory(&fValue, &iValue, 4); return fValue; @@ -328,11 +329,11 @@ static float tsmf_stream_read_float(wStream* s) UINT tsmf_ifman_set_source_video_rect(TSMF_IFMAN* ifman) { UINT status = CHANNEL_RC_OK; - float Left; - float Top; - float Right; - float Bottom; - TSMF_PRESENTATION* presentation; + float Left = NAN; + float Top = NAN; + float Right = NAN; + float Bottom = NAN; + TSMF_PRESENTATION* presentation = NULL; DEBUG_TSMF(""); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, 32)) @@ -366,7 +367,7 @@ UINT tsmf_ifman_set_source_video_rect(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_shutdown_presentation(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation; + TSMF_PRESENTATION* presentation = NULL; DEBUG_TSMF(""); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, GUID_SIZE)) @@ -397,9 +398,9 @@ UINT tsmf_ifman_shutdown_presentation(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_stream_volume(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation; - UINT32 newVolume; - UINT32 muted; + TSMF_PRESENTATION* presentation = NULL; + UINT32 newVolume = 0; + UINT32 muted = 0; DEBUG_TSMF("on stream volume"); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, GUID_SIZE + 8)) @@ -433,7 +434,7 @@ UINT tsmf_ifman_on_stream_volume(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_channel_volume(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation; + TSMF_PRESENTATION* presentation = NULL; DEBUG_TSMF("on channel volume"); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, GUID_SIZE + 8)) @@ -443,8 +444,8 @@ UINT tsmf_ifman_on_channel_volume(TSMF_IFMAN* ifman) if (presentation) { - UINT32 channelVolume; - UINT32 changedChannel; + UINT32 channelVolume = 0; + UINT32 changedChannel = 0; Stream_Seek(ifman->input, 16); Stream_Read_UINT32(ifman->input, channelVolume); DEBUG_TSMF("on channel volume: channel volume=[%" PRIu32 "]", channelVolume); @@ -475,18 +476,18 @@ UINT tsmf_ifman_set_video_window(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_update_geometry_info(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation; - UINT32 numGeometryInfo; - UINT32 Left; - UINT32 Top; - UINT32 Width; - UINT32 Height; - UINT32 cbVisibleRect; + TSMF_PRESENTATION* presentation = NULL; + UINT32 numGeometryInfo = 0; + UINT32 Left = 0; + UINT32 Top = 0; + UINT32 Width = 0; + UINT32 Height = 0; + UINT32 cbVisibleRect = 0; RDP_RECT* rects = NULL; int num_rects = 0; UINT error = CHANNEL_RC_OK; - int i; - size_t pos; + int i = 0; + size_t pos = 0; if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, GUID_SIZE + 32)) return ERROR_INVALID_DATA; @@ -572,15 +573,15 @@ UINT tsmf_ifman_notify_preroll(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_sample(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation; - TSMF_STREAM* stream; - UINT32 StreamId; - UINT64 SampleStartTime; - UINT64 SampleEndTime; - UINT64 ThrottleDuration; - UINT32 SampleExtensions; - UINT32 cbData; - UINT error; + TSMF_PRESENTATION* presentation = NULL; + TSMF_STREAM* stream = NULL; + UINT32 StreamId = 0; + UINT64 SampleStartTime = 0; + UINT64 SampleEndTime = 0; + UINT64 ThrottleDuration = 0; + UINT32 SampleExtensions = 0; + UINT32 cbData = 0; + UINT error = 0; if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, 60)) return ERROR_INVALID_DATA; @@ -644,9 +645,9 @@ UINT tsmf_ifman_on_sample(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_flush(TSMF_IFMAN* ifman) { - UINT32 StreamId; - TSMF_PRESENTATION* presentation; - TSMF_STREAM* stream; + UINT32 StreamId = 0; + TSMF_PRESENTATION* presentation = NULL; + TSMF_STREAM* stream = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, 20)) return ERROR_INVALID_DATA; @@ -686,9 +687,9 @@ UINT tsmf_ifman_on_flush(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_end_of_stream(TSMF_IFMAN* ifman) { - UINT32 StreamId; + UINT32 StreamId = 0; TSMF_STREAM* stream = NULL; - TSMF_PRESENTATION* presentation; + TSMF_PRESENTATION* presentation = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, 20)) return ERROR_INVALID_DATA; @@ -718,7 +719,7 @@ UINT tsmf_ifman_on_end_of_stream(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_playback_started(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation; + TSMF_PRESENTATION* presentation = NULL; DEBUG_TSMF(""); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, 16)) @@ -749,7 +750,7 @@ UINT tsmf_ifman_on_playback_started(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_playback_paused(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation; + TSMF_PRESENTATION* presentation = NULL; DEBUG_TSMF(""); ifman->output_pending = TRUE; /* Added pause control so gstreamer pipeline can be paused accordingly */ @@ -773,7 +774,7 @@ UINT tsmf_ifman_on_playback_paused(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_playback_restarted(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation; + TSMF_PRESENTATION* presentation = NULL; DEBUG_TSMF(""); ifman->output_pending = TRUE; /* Added restart control so gstreamer pipeline can be resumed accordingly */ @@ -797,7 +798,7 @@ UINT tsmf_ifman_on_playback_restarted(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_playback_stopped(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation; + TSMF_PRESENTATION* presentation = NULL; DEBUG_TSMF(""); presentation = tsmf_presentation_find_by_id(Stream_Pointer(ifman->input)); diff --git a/channels/tsmf/client/tsmf_main.c b/channels/tsmf/client/tsmf_main.c index d05d955d2..877ef24f1 100644 --- a/channels/tsmf/client/tsmf_main.c +++ b/channels/tsmf/client/tsmf_main.c @@ -125,15 +125,15 @@ BOOL tsmf_playback_ack(IWTSVirtualChannelCallback* pChannelCallback, UINT32 mess */ static UINT tsmf_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* data) { - size_t length; - wStream* input; - wStream* output; + size_t length = 0; + wStream* input = NULL; + wStream* output = NULL; UINT error = CHANNEL_RC_OK; BOOL processed = FALSE; TSMF_IFMAN ifman = { 0 }; - UINT32 MessageId; - UINT32 FunctionId; - UINT32 InterfaceId; + UINT32 MessageId = 0; + UINT32 FunctionId = 0; + UINT32 InterfaceId = 0; TSMF_CHANNEL_CALLBACK* callback = (TSMF_CHANNEL_CALLBACK*)pChannelCallback; UINT32 cbSize = Stream_GetRemainingLength(data); @@ -399,8 +399,8 @@ out: */ static UINT tsmf_on_close(IWTSVirtualChannelCallback* pChannelCallback) { - TSMF_STREAM* stream; - TSMF_PRESENTATION* presentation; + TSMF_STREAM* stream = NULL; + TSMF_PRESENTATION* presentation = NULL; TSMF_CHANNEL_CALLBACK* callback = (TSMF_CHANNEL_CALLBACK*)pChannelCallback; DEBUG_TSMF(""); @@ -430,7 +430,7 @@ static UINT tsmf_on_new_channel_connection(IWTSListenerCallback* pListenerCallba IWTSVirtualChannel* pChannel, BYTE* Data, BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - TSMF_CHANNEL_CALLBACK* callback; + TSMF_CHANNEL_CALLBACK* callback = NULL; TSMF_LISTENER_CALLBACK* listener_callback = (TSMF_LISTENER_CALLBACK*)pListenerCallback; DEBUG_TSMF(""); callback = (TSMF_CHANNEL_CALLBACK*)calloc(1, sizeof(TSMF_CHANNEL_CALLBACK)); @@ -455,7 +455,7 @@ static UINT tsmf_on_new_channel_connection(IWTSListenerCallback* pListenerCallba */ static UINT tsmf_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelManager* pChannelMgr) { - UINT status; + UINT status = 0; TSMF_PLUGIN* tsmf = (TSMF_PLUGIN*)pPlugin; DEBUG_TSMF(""); tsmf->listener_callback = (TSMF_LISTENER_CALLBACK*)calloc(1, sizeof(TSMF_LISTENER_CALLBACK)); @@ -493,9 +493,9 @@ static UINT tsmf_plugin_terminated(IWTSPlugin* pPlugin) */ static UINT tsmf_process_addin_args(IWTSPlugin* pPlugin, const ADDIN_ARGV* args) { - int status; - DWORD flags; - const COMMAND_LINE_ARGUMENT_A* arg; + int status = 0; + DWORD flags = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; TSMF_PLUGIN* tsmf = (TSMF_PLUGIN*)pPlugin; COMMAND_LINE_ARGUMENT_A tsmf_args[] = { { "sys", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "audio subsystem" }, @@ -555,8 +555,8 @@ static UINT tsmf_process_addin_args(IWTSPlugin* pPlugin, const ADDIN_ARGV* args) FREERDP_ENTRY_POINT(UINT tsmf_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)) { UINT status = 0; - TSMF_PLUGIN* tsmf; - TsmfClientContext* context; + TSMF_PLUGIN* tsmf = NULL; + TsmfClientContext* context = NULL; UINT error = CHANNEL_RC_NO_MEMORY; tsmf = (TSMF_PLUGIN*)pEntryPoints->GetPlugin(pEntryPoints, "tsmf"); diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c index 533ee8117..2cbd49138 100644 --- a/channels/tsmf/client/tsmf_media.c +++ b/channels/tsmf/client/tsmf_media.c @@ -166,10 +166,10 @@ static UINT64 get_current_time(void) static TSMF_SAMPLE* tsmf_stream_pop_sample(TSMF_STREAM* stream, int sync) { - UINT32 index; - UINT32 count; - TSMF_STREAM* s; - TSMF_SAMPLE* sample; + UINT32 index = 0; + UINT32 count = 0; + TSMF_STREAM* s = NULL; + TSMF_SAMPLE* sample = NULL; BOOL pending = FALSE; TSMF_PRESENTATION* presentation = NULL; @@ -288,8 +288,8 @@ static BOOL tsmf_sample_queue_ack(TSMF_SAMPLE* sample) static BOOL tsmf_stream_process_ack(void* arg, BOOL force) { TSMF_STREAM* stream = arg; - TSMF_SAMPLE* sample; - UINT64 ack_time; + TSMF_SAMPLE* sample = NULL; + UINT64 ack_time = 0; BOOL rc = FALSE; if (!stream) @@ -341,8 +341,8 @@ finally: TSMF_PRESENTATION* tsmf_presentation_new(const BYTE* guid, IWTSVirtualChannelCallback* pChannelCallback) { - wObject* obj; - TSMF_PRESENTATION* presentation; + wObject* obj = NULL; + TSMF_PRESENTATION* presentation = NULL; if (!guid || !pChannelCallback) return NULL; @@ -381,7 +381,7 @@ error_stream_list: static char* guid_to_string(const BYTE* guid, char* str, size_t len) { - size_t i; + size_t i = 0; if (!guid || !str) return NULL; @@ -394,8 +394,8 @@ static char* guid_to_string(const BYTE* guid, char* str, size_t len) TSMF_PRESENTATION* tsmf_presentation_find_by_id(const BYTE* guid) { - UINT32 index; - UINT32 count; + UINT32 index = 0; + UINT32 count = 0; BOOL found = FALSE; char guid_str[GUID_SIZE * 2 + 1] = { 0 }; TSMF_PRESENTATION* presentation = NULL; @@ -424,7 +424,7 @@ TSMF_PRESENTATION* tsmf_presentation_find_by_id(const BYTE* guid) static BOOL tsmf_sample_playback_video(TSMF_SAMPLE* sample) { - UINT64 t; + UINT64 t = 0; TSMF_VIDEO_FRAME_EVENT event; TSMF_STREAM* stream = sample->stream; TSMF_PRESENTATION* presentation = stream->presentation; @@ -521,7 +521,7 @@ static BOOL tsmf_sample_playback_audio(TSMF_SAMPLE* sample) { UINT64 latency = 0; TSMF_STREAM* stream = sample->stream; - BOOL ret; + BOOL ret = 0; DEBUG_TSMF("MessageId %" PRIu32 " EndTime %" PRIu64 " consumed.", sample->sample_id, sample->end_time); @@ -559,8 +559,8 @@ static BOOL tsmf_sample_playback_audio(TSMF_SAMPLE* sample) static BOOL tsmf_sample_playback(TSMF_SAMPLE* sample) { BOOL ret = FALSE; - UINT32 width; - UINT32 height; + UINT32 width = 0; + UINT32 height = 0; UINT32 pixfmt = 0; TSMF_STREAM* stream = sample->stream; @@ -583,7 +583,7 @@ static BOOL tsmf_sample_playback(TSMF_SAMPLE* sample) for (index = 0; index < count; index++) { - UINT64 time_diff; + UINT64 time_diff = 0; temp_stream = (TSMF_STREAM*)ArrayList_GetItem(presentation->stream_list, index); if (temp_stream->major_type == TSMF_MAJOR_TYPE_AUDIO) @@ -817,7 +817,7 @@ static DWORD WINAPI tsmf_stream_playback_func(LPVOID arg) TSMF_STREAM* stream = (TSMF_STREAM*)arg; TSMF_PRESENTATION* presentation = stream->presentation; UINT error = CHANNEL_RC_OK; - DWORD status; + DWORD status = 0; DEBUG_TSMF("in %" PRIu32 "", stream->stream_id); if (stream->major_type == TSMF_MAJOR_TYPE_AUDIO && stream->sample_rate && stream->channels && @@ -971,9 +971,9 @@ static BOOL tsmf_stream_change_volume(TSMF_STREAM* stream, UINT32 newVolume, UIN BOOL tsmf_presentation_volume_changed(TSMF_PRESENTATION* presentation, UINT32 newVolume, UINT32 muted) { - UINT32 index; - UINT32 count; - TSMF_STREAM* stream; + UINT32 index = 0; + UINT32 count = 0; + TSMF_STREAM* stream = NULL; BOOL ret = TRUE; presentation->volume = newVolume; presentation->muted = muted; @@ -992,9 +992,9 @@ BOOL tsmf_presentation_volume_changed(TSMF_PRESENTATION* presentation, UINT32 ne BOOL tsmf_presentation_paused(TSMF_PRESENTATION* presentation) { - UINT32 index; - UINT32 count; - TSMF_STREAM* stream; + UINT32 index = 0; + UINT32 count = 0; + TSMF_STREAM* stream = NULL; BOOL ret = TRUE; ArrayList_Lock(presentation->stream_list); count = ArrayList_Count(presentation->stream_list); @@ -1011,9 +1011,9 @@ BOOL tsmf_presentation_paused(TSMF_PRESENTATION* presentation) BOOL tsmf_presentation_restarted(TSMF_PRESENTATION* presentation) { - UINT32 index; - UINT32 count; - TSMF_STREAM* stream; + UINT32 index = 0; + UINT32 count = 0; + TSMF_STREAM* stream = NULL; BOOL ret = TRUE; ArrayList_Lock(presentation->stream_list); count = ArrayList_Count(presentation->stream_list); @@ -1030,9 +1030,9 @@ BOOL tsmf_presentation_restarted(TSMF_PRESENTATION* presentation) BOOL tsmf_presentation_start(TSMF_PRESENTATION* presentation) { - UINT32 index; - UINT32 count; - TSMF_STREAM* stream; + UINT32 index = 0; + UINT32 count = 0; + TSMF_STREAM* stream = NULL; BOOL ret = TRUE; ArrayList_Lock(presentation->stream_list); count = ArrayList_Count(presentation->stream_list); @@ -1054,9 +1054,9 @@ BOOL tsmf_presentation_start(TSMF_PRESENTATION* presentation) */ UINT tsmf_presentation_sync(TSMF_PRESENTATION* presentation) { - UINT32 index; - UINT32 count; - UINT error; + UINT32 index = 0; + UINT32 count = 0; + UINT error = 0; ArrayList_Lock(presentation->stream_list); count = ArrayList_Count(presentation->stream_list); @@ -1078,9 +1078,9 @@ UINT tsmf_presentation_sync(TSMF_PRESENTATION* presentation) BOOL tsmf_presentation_stop(TSMF_PRESENTATION* presentation) { - UINT32 index; - UINT32 count; - TSMF_STREAM* stream; + UINT32 index = 0; + UINT32 count = 0; + TSMF_STREAM* stream = NULL; BOOL ret = TRUE; ArrayList_Lock(presentation->stream_list); count = ArrayList_Count(presentation->stream_list); @@ -1101,9 +1101,9 @@ BOOL tsmf_presentation_set_geometry_info(TSMF_PRESENTATION* presentation, UINT32 UINT32 width, UINT32 height, int num_rects, RDP_RECT* rects) { - UINT32 index; - UINT32 count; - TSMF_STREAM* stream; + UINT32 index = 0; + UINT32 count = 0; + TSMF_STREAM* stream = NULL; void* tmp_rects = NULL; BOOL ret = TRUE; @@ -1206,8 +1206,8 @@ void tsmf_presentation_free(TSMF_PRESENTATION* presentation) TSMF_STREAM* tsmf_stream_new(TSMF_PRESENTATION* presentation, UINT32 stream_id, rdpContext* rdpcontext) { - wObject* obj; - TSMF_STREAM* stream; + wObject* obj = NULL; + TSMF_STREAM* stream = NULL; stream = tsmf_stream_find_by_id(presentation, stream_id); if (stream) @@ -1313,8 +1313,8 @@ void tsmf_stream_start_threads(TSMF_STREAM* stream) TSMF_STREAM* tsmf_stream_find_by_id(TSMF_PRESENTATION* presentation, UINT32 stream_id) { - UINT32 index; - UINT32 count; + UINT32 index = 0; + UINT32 count = 0; BOOL found = FALSE; TSMF_STREAM* stream = NULL; ArrayList_Lock(presentation->stream_list); @@ -1475,7 +1475,7 @@ BOOL tsmf_stream_push_sample(TSMF_STREAM* stream, IWTSVirtualChannelCallback* pC UINT32 sample_id, UINT64 start_time, UINT64 end_time, UINT64 duration, UINT32 extensions, UINT32 data_size, BYTE* data) { - TSMF_SAMPLE* sample; + TSMF_SAMPLE* sample = NULL; SetEvent(stream->ready); if (TERMINATING) @@ -1538,7 +1538,7 @@ static void tsmf_signal_handler(int s) BOOL tsmf_media_init(void) { - wObject* obj; + wObject* obj = NULL; #ifndef _WIN32 struct sigaction sigtrap; sigtrap.sa_handler = tsmf_signal_handler; diff --git a/channels/urbdrc/client/data_transfer.c b/channels/urbdrc/client/data_transfer.c index 40f91de65..ed7056833 100644 --- a/channels/urbdrc/client/data_transfer.c +++ b/channels/urbdrc/client/data_transfer.c @@ -124,7 +124,7 @@ static UINT urbdrc_process_register_request_callback(IUDEVICE* pdev, { UINT32 NumRequestCompletion = 0; UINT32 RequestCompletion = 0; - URBDRC_PLUGIN* urbdrc; + URBDRC_PLUGIN* urbdrc = NULL; if (!callback || !s || !udevman || !pdev) return ERROR_INVALID_PARAMETER; @@ -159,8 +159,8 @@ static UINT urbdrc_process_register_request_callback(IUDEVICE* pdev, static UINT urbdrc_process_cancel_request(IUDEVICE* pdev, wStream* s, IUDEVMAN* udevman) { - UINT32 CancelId; - URBDRC_PLUGIN* urbdrc; + UINT32 CancelId = 0; + URBDRC_PLUGIN* urbdrc = NULL; if (!s || !udevman || !pdev) return ERROR_INVALID_PARAMETER; @@ -181,8 +181,8 @@ static UINT urbdrc_process_cancel_request(IUDEVICE* pdev, wStream* s, IUDEVMAN* static UINT urbdrc_process_retract_device_request(IUDEVICE* pdev, wStream* s, IUDEVMAN* udevman) { - UINT32 Reason; - URBDRC_PLUGIN* urbdrc; + UINT32 Reason = 0; + URBDRC_PLUGIN* urbdrc = NULL; if (!s || !udevman) return ERROR_INVALID_PARAMETER; @@ -216,15 +216,15 @@ static UINT urbdrc_process_retract_device_request(IUDEVICE* pdev, wStream* s, IU static UINT urbdrc_process_io_control(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callback, wStream* s, UINT32 MessageId, IUDEVMAN* udevman) { - UINT32 InterfaceId; - UINT32 IoControlCode; - UINT32 InputBufferSize; - UINT32 OutputBufferSize; - UINT32 RequestId; + UINT32 InterfaceId = 0; + UINT32 IoControlCode = 0; + UINT32 InputBufferSize = 0; + UINT32 OutputBufferSize = 0; + UINT32 RequestId = 0; UINT32 usbd_status = USBD_STATUS_SUCCESS; - wStream* out; + wStream* out = NULL; int success = 0; - URBDRC_PLUGIN* urbdrc; + URBDRC_PLUGIN* urbdrc = NULL; if (!callback || !s || !udevman || !pdev) return ERROR_INVALID_PARAMETER; @@ -317,13 +317,13 @@ static UINT urbdrc_process_io_control(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* static UINT urbdrc_process_internal_io_control(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callback, wStream* s, UINT32 MessageId, IUDEVMAN* udevman) { - wStream* out; - UINT32 IoControlCode; - UINT32 InterfaceId; - UINT32 InputBufferSize; - UINT32 OutputBufferSize; - UINT32 RequestId; - UINT32 frames; + wStream* out = NULL; + UINT32 IoControlCode = 0; + UINT32 InterfaceId = 0; + UINT32 InputBufferSize = 0; + UINT32 OutputBufferSize = 0; + UINT32 RequestId = 0; + UINT32 frames = 0; if (!pdev || !callback || !s || !udevman) return ERROR_INVALID_PARAMETER; @@ -356,13 +356,13 @@ static UINT urbdrc_process_internal_io_control(IUDEVICE* pdev, GENERIC_CHANNEL_C static UINT urbdrc_process_query_device_text(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callback, wStream* s, UINT32 MessageId, IUDEVMAN* udevman) { - UINT32 out_size; - UINT32 TextType; - UINT32 LocaleId; - UINT32 InterfaceId; + UINT32 out_size = 0; + UINT32 TextType = 0; + UINT32 LocaleId = 0; + UINT32 InterfaceId = 0; UINT8 bufferSize = 0xFF; - UINT32 hr; - wStream* out; + UINT32 hr = 0; + wStream* out = NULL; BYTE DeviceDescription[0x100] = { 0 }; if (!pdev || !callback || !s || !udevman) @@ -399,10 +399,10 @@ static UINT urbdrc_process_query_device_text(IUDEVICE* pdev, GENERIC_CHANNEL_CAL static void func_select_all_interface_for_msconfig(IUDEVICE* pdev, MSUSB_CONFIG_DESCRIPTOR* MsConfig) { - UINT32 inum; + UINT32 inum = 0; MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces = MsConfig->MsInterfaces; - BYTE InterfaceNumber; - BYTE AlternateSetting; + BYTE InterfaceNumber = 0; + BYTE AlternateSetting = 0; UINT32 NumInterfaces = MsConfig->NumInterfaces; for (inum = 0; inum < NumInterfaces; inum++) @@ -418,14 +418,14 @@ static UINT urb_select_configuration(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* c int transferDir) { MSUSB_CONFIG_DESCRIPTOR* MsConfig = NULL; - size_t out_size; - UINT32 InterfaceId; - UINT32 NumInterfaces; + size_t out_size = 0; + UINT32 InterfaceId = 0; + UINT32 NumInterfaces = 0; UINT32 usbd_status = 0; - BYTE ConfigurationDescriptorIsValid; - wStream* out; + BYTE ConfigurationDescriptorIsValid = 0; + wStream* out = NULL; int MsOutSize = 0; - URBDRC_PLUGIN* urbdrc; + URBDRC_PLUGIN* urbdrc = NULL; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -536,16 +536,16 @@ static UINT urb_select_interface(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callb UINT32 RequestField, UINT32 MessageId, IUDEVMAN* udevman, int transferDir) { - MSUSB_CONFIG_DESCRIPTOR* MsConfig; - MSUSB_INTERFACE_DESCRIPTOR* MsInterface; - UINT32 out_size; - UINT32 InterfaceId; - UINT32 ConfigurationHandle; - UINT32 OutputBufferSize; - BYTE InterfaceNumber; - wStream* out; - UINT32 interface_size; - URBDRC_PLUGIN* urbdrc; + MSUSB_CONFIG_DESCRIPTOR* MsConfig = NULL; + MSUSB_INTERFACE_DESCRIPTOR* MsInterface = NULL; + UINT32 out_size = 0; + UINT32 InterfaceId = 0; + UINT32 ConfigurationHandle = 0; + UINT32 OutputBufferSize = 0; + BYTE InterfaceNumber = 0; + wStream* out = NULL; + UINT32 interface_size = 0; + URBDRC_PLUGIN* urbdrc = NULL; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -627,22 +627,22 @@ static UINT urb_control_transfer(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callb UINT32 RequestField, UINT32 MessageId, IUDEVMAN* udevman, int transferDir, int External) { - UINT32 out_size; - UINT32 InterfaceId; - UINT32 EndpointAddress; - UINT32 PipeHandle; - UINT32 TransferFlags; - UINT32 OutputBufferSize; - UINT32 usbd_status; - UINT32 Timeout; - BYTE bmRequestType; - BYTE Request; - UINT16 Value; - UINT16 Index; - UINT16 length; - BYTE* buffer; - wStream* out; - URBDRC_PLUGIN* urbdrc; + UINT32 out_size = 0; + UINT32 InterfaceId = 0; + UINT32 EndpointAddress = 0; + UINT32 PipeHandle = 0; + UINT32 TransferFlags = 0; + UINT32 OutputBufferSize = 0; + UINT32 usbd_status = 0; + UINT32 Timeout = 0; + BYTE bmRequestType = 0; + BYTE Request = 0; + UINT16 Value = 0; + UINT16 Index = 0; + UINT16 length = 0; + BYTE* buffer = NULL; + wStream* out = NULL; + URBDRC_PLUGIN* urbdrc = NULL; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -740,10 +740,10 @@ static UINT urb_bulk_or_interrupt_transfer(IUDEVICE* pdev, GENERIC_CHANNEL_CALLB wStream* s, UINT32 RequestField, UINT32 MessageId, IUDEVMAN* udevman, int transferDir) { - UINT32 EndpointAddress; - UINT32 PipeHandle; - UINT32 TransferFlags; - UINT32 OutputBufferSize; + UINT32 EndpointAddress = 0; + UINT32 PipeHandle = 0; + UINT32 TransferFlags = 0; + UINT32 OutputBufferSize = 0; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -824,15 +824,15 @@ static UINT urb_isoch_transfer(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callbac UINT32 RequestField, UINT32 MessageId, IUDEVMAN* udevman, int transferDir) { - int rc; - UINT32 EndpointAddress; - UINT32 PipeHandle; - UINT32 TransferFlags; - UINT32 StartFrame; - UINT32 NumberOfPackets; - UINT32 ErrorCount; - UINT32 OutputBufferSize; - BYTE* packetDescriptorData; + int rc = 0; + UINT32 EndpointAddress = 0; + UINT32 PipeHandle = 0; + UINT32 TransferFlags = 0; + UINT32 StartFrame = 0; + UINT32 NumberOfPackets = 0; + UINT32 ErrorCount = 0; + UINT32 OutputBufferSize = 0; + BYTE* packetDescriptorData = NULL; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -880,16 +880,16 @@ static UINT urb_control_descriptor_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLB wStream* s, UINT32 RequestField, UINT32 MessageId, IUDEVMAN* udevman, BYTE func_recipient, int transferDir) { - size_t out_size; - UINT32 InterfaceId; - UINT32 OutputBufferSize; - UINT32 usbd_status; - BYTE bmRequestType; - BYTE desc_index; - BYTE desc_type; - UINT16 langId; - wStream* out; - URBDRC_PLUGIN* urbdrc; + size_t out_size = 0; + UINT32 InterfaceId = 0; + UINT32 OutputBufferSize = 0; + UINT32 usbd_status = 0; + BYTE bmRequestType = 0; + BYTE desc_index = 0; + BYTE desc_type = 0; + UINT16 langId = 0; + wStream* out = NULL; + URBDRC_PLUGIN* urbdrc = NULL; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -964,14 +964,14 @@ static UINT urb_control_get_status_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLB wStream* s, UINT32 RequestField, UINT32 MessageId, IUDEVMAN* udevman, BYTE func_recipient, int transferDir) { - size_t out_size; - UINT32 InterfaceId; - UINT32 OutputBufferSize; - UINT32 usbd_status; - UINT16 Index; - BYTE bmRequestType; - wStream* out; - URBDRC_PLUGIN* urbdrc; + size_t out_size = 0; + UINT32 InterfaceId = 0; + UINT32 OutputBufferSize = 0; + UINT32 usbd_status = 0; + UINT16 Index = 0; + BYTE bmRequestType = 0; + wStream* out = NULL; + URBDRC_PLUGIN* urbdrc = NULL; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1026,19 +1026,19 @@ static UINT urb_control_vendor_or_class_request(IUDEVICE* pdev, GENERIC_CHANNEL_ IUDEVMAN* udevman, BYTE func_type, BYTE func_recipient, int transferDir) { - UINT32 out_size; - UINT32 InterfaceId; - UINT32 TransferFlags; - UINT32 usbd_status; - UINT32 OutputBufferSize; - BYTE ReqTypeReservedBits; - BYTE Request; - BYTE bmRequestType; - UINT16 Value; - UINT16 Index; - UINT16 Padding; - wStream* out; - URBDRC_PLUGIN* urbdrc; + UINT32 out_size = 0; + UINT32 InterfaceId = 0; + UINT32 TransferFlags = 0; + UINT32 usbd_status = 0; + UINT32 OutputBufferSize = 0; + BYTE ReqTypeReservedBits = 0; + BYTE Request = 0; + BYTE bmRequestType = 0; + UINT16 Value = 0; + UINT16 Index = 0; + UINT16 Padding = 0; + wStream* out = NULL; + URBDRC_PLUGIN* urbdrc = NULL; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1115,17 +1115,17 @@ static UINT urb_os_feature_descriptor_request(IUDEVICE* pdev, GENERIC_CHANNEL_CA wStream* s, UINT32 RequestField, UINT32 MessageId, IUDEVMAN* udevman, int transferDir) { - size_t out_size; - UINT32 InterfaceId; - UINT32 OutputBufferSize; - UINT32 usbd_status; - BYTE Recipient; - BYTE InterfaceNumber; - BYTE Ms_PageIndex; - UINT16 Ms_featureDescIndex; - wStream* out; - int ret; - URBDRC_PLUGIN* urbdrc; + size_t out_size = 0; + UINT32 InterfaceId = 0; + UINT32 OutputBufferSize = 0; + UINT32 usbd_status = 0; + BYTE Recipient = 0; + BYTE InterfaceNumber = 0; + BYTE Ms_PageIndex = 0; + UINT16 Ms_featureDescIndex = 0; + wStream* out = NULL; + int ret = 0; + URBDRC_PLUGIN* urbdrc = NULL; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1204,16 +1204,16 @@ static UINT urb_pipe_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callback, UINT32 RequestField, UINT32 MessageId, IUDEVMAN* udevman, int transferDir, int action) { - UINT32 out_size; - UINT32 InterfaceId; - UINT32 PipeHandle; - UINT32 EndpointAddress; - UINT32 OutputBufferSize; + UINT32 out_size = 0; + UINT32 InterfaceId = 0; + UINT32 PipeHandle = 0; + UINT32 EndpointAddress = 0; + UINT32 OutputBufferSize = 0; UINT32 usbd_status = 0; - wStream* out; + wStream* out = NULL; UINT32 ret = USBD_STATUS_REQUEST_FAILED; - int rc; - URBDRC_PLUGIN* urbdrc; + int rc = 0; + URBDRC_PLUGIN* urbdrc = NULL; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1287,12 +1287,12 @@ static UINT urb_get_current_frame_number(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBAC wStream* s, UINT32 RequestField, UINT32 MessageId, IUDEVMAN* udevman, int transferDir) { - UINT32 out_size; - UINT32 InterfaceId; - UINT32 OutputBufferSize; - UINT32 dummy_frames; - wStream* out; - URBDRC_PLUGIN* urbdrc; + UINT32 out_size = 0; + UINT32 InterfaceId = 0; + UINT32 OutputBufferSize = 0; + UINT32 dummy_frames = 0; + wStream* out = NULL; + URBDRC_PLUGIN* urbdrc = NULL; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1352,12 +1352,12 @@ static UINT urb_control_get_configuration_request(IUDEVICE* pdev, UINT32 RequestField, UINT32 MessageId, IUDEVMAN* udevman, int transferDir) { - size_t out_size; - UINT32 InterfaceId; - UINT32 OutputBufferSize; - UINT32 usbd_status; - wStream* out; - URBDRC_PLUGIN* urbdrc; + size_t out_size = 0; + UINT32 InterfaceId = 0; + UINT32 OutputBufferSize = 0; + UINT32 usbd_status = 0; + wStream* out = NULL; + URBDRC_PLUGIN* urbdrc = NULL; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1410,13 +1410,13 @@ static UINT urb_control_get_interface_request(IUDEVICE* pdev, GENERIC_CHANNEL_CA wStream* s, UINT32 RequestField, UINT32 MessageId, IUDEVMAN* udevman, int transferDir) { - size_t out_size; - UINT32 InterfaceId; - UINT32 OutputBufferSize; - UINT32 usbd_status; - UINT16 InterfaceNr; - wStream* out; - URBDRC_PLUGIN* urbdrc; + size_t out_size = 0; + UINT32 InterfaceId = 0; + UINT32 OutputBufferSize = 0; + UINT32 usbd_status = 0; + UINT16 InterfaceNr = 0; + wStream* out = NULL; + URBDRC_PLUGIN* urbdrc = NULL; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1470,15 +1470,15 @@ static UINT urb_control_feature_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK IUDEVMAN* udevman, BYTE func_recipient, BYTE command, int transferDir) { - UINT32 InterfaceId; - UINT32 OutputBufferSize; - UINT32 usbd_status; - UINT16 FeatureSelector; - UINT16 Index; - BYTE bmRequestType; - BYTE bmRequest; - wStream* out; - URBDRC_PLUGIN* urbdrc; + UINT32 InterfaceId = 0; + UINT32 OutputBufferSize = 0; + UINT32 usbd_status = 0; + UINT16 FeatureSelector = 0; + UINT16 Index = 0; + BYTE bmRequestType = 0; + BYTE bmRequest = 0; + wStream* out = NULL; + URBDRC_PLUGIN* urbdrc = NULL; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1567,12 +1567,12 @@ static UINT urbdrc_process_transfer_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALL wStream* s, UINT32 MessageId, IUDEVMAN* udevman, int transferDir) { - UINT32 CbTsUrb; - UINT16 Size; - UINT16 URB_Function; - UINT32 RequestId; + UINT32 CbTsUrb = 0; + UINT16 Size = 0; + UINT16 URB_Function = 0; + UINT32 RequestId = 0; UINT error = ERROR_INTERNAL_ERROR; - URBDRC_PLUGIN* urbdrc; + URBDRC_PLUGIN* urbdrc = NULL; if (!callback || !s || !udevman || !pdev) return ERROR_INVALID_PARAMETER; @@ -1859,10 +1859,10 @@ static UINT urbdrc_process_transfer_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALL UINT urbdrc_process_udev_data_transfer(GENERIC_CHANNEL_CALLBACK* callback, URBDRC_PLUGIN* urbdrc, IUDEVMAN* udevman, wStream* data) { - UINT32 InterfaceId; - UINT32 MessageId; - UINT32 FunctionId; - IUDEVICE* pdev; + UINT32 InterfaceId = 0; + UINT32 MessageId = 0; + UINT32 FunctionId = 0; + IUDEVICE* pdev = NULL; UINT error = ERROR_INTERNAL_ERROR; if (!urbdrc || !data || !callback || !udevman) diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c index 9c5c88ade..956c39380 100644 --- a/channels/urbdrc/client/libusb/libusb_udevice.c +++ b/channels/urbdrc/client/libusb/libusb_udevice.c @@ -84,8 +84,8 @@ static void request_free(void* value); static struct libusb_transfer* list_contains(wArrayList* list, UINT32 streamID) { - size_t x; - size_t count; + size_t x = 0; + size_t count = 0; if (!list) return NULL; count = ArrayList_Count(list); @@ -206,7 +206,7 @@ static ASYNC_TRANSFER_USER_DATA* async_transfer_user_data_new(IUDEVICE* idev, UI BOOL NoAck, t_isoch_transfer_cb cb, GENERIC_CHANNEL_CALLBACK* callback) { - ASYNC_TRANSFER_USER_DATA* user_data; + ASYNC_TRANSFER_USER_DATA* user_data = NULL; UDEVICE* pdev = (UDEVICE*)idev; if (BufferSize > UINT32_MAX) @@ -261,7 +261,7 @@ static void LIBUSB_CALL func_iso_callback(struct libusb_transfer* transfer) { case LIBUSB_TRANSFER_COMPLETED: { - int i; + int i = 0; UINT32 index = 0; BYTE* dataStart = Stream_Pointer(user_data->data); Stream_SetPosition(user_data->data, @@ -328,12 +328,12 @@ static const LIBUSB_ENDPOINT_DESCEIPTOR* func_get_ep_desc(LIBUSB_CONFIG_DESCRIPT MSUSB_CONFIG_DESCRIPTOR* MsConfig, UINT32 EndpointAddress) { - BYTE alt; - UINT32 inum; - UINT32 pnum; - MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces; - const LIBUSB_INTERFACE* interface; - const LIBUSB_ENDPOINT_DESCEIPTOR* endpoint; + BYTE alt = 0; + UINT32 inum = 0; + UINT32 pnum = 0; + MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces = NULL; + const LIBUSB_INTERFACE* interface = NULL; + const LIBUSB_ENDPOINT_DESCEIPTOR* endpoint = NULL; MsInterfaces = MsConfig->MsInterfaces; interface = LibusbConfig->interface; @@ -356,9 +356,9 @@ static const LIBUSB_ENDPOINT_DESCEIPTOR* func_get_ep_desc(LIBUSB_CONFIG_DESCRIPT static void LIBUSB_CALL func_bulk_transfer_cb(struct libusb_transfer* transfer) { - ASYNC_TRANSFER_USER_DATA* user_data; - uint32_t streamID; - wArrayList* list; + ASYNC_TRANSFER_USER_DATA* user_data = NULL; + uint32_t streamID = 0; + wArrayList* list = NULL; user_data = (ASYNC_TRANSFER_USER_DATA*)transfer->user_data; if (!user_data) @@ -469,7 +469,7 @@ static int func_config_release_all_interface(URBDRC_PLUGIN* urbdrc, LIBUSB_DEVICE_HANDLE* libusb_handle, UINT32 NumInterfaces) { - UINT32 i; + UINT32 i = 0; for (i = 0; i < NumInterfaces; i++) { @@ -485,8 +485,8 @@ static int func_config_release_all_interface(URBDRC_PLUGIN* urbdrc, static int func_claim_all_interface(URBDRC_PLUGIN* urbdrc, LIBUSB_DEVICE_HANDLE* libusb_handle, int NumInterfaces) { - int i; - int ret; + int i = 0; + int ret = 0; for (i = 0; i < NumInterfaces; i++) { @@ -502,7 +502,7 @@ static int func_claim_all_interface(URBDRC_PLUGIN* urbdrc, LIBUSB_DEVICE_HANDLE* static LIBUSB_DEVICE* udev_get_libusb_dev(libusb_context* context, uint8_t bus_number, uint8_t dev_number) { - ssize_t i; + ssize_t i = 0; LIBUSB_DEVICE** libusb_list = NULL; LIBUSB_DEVICE* device = NULL; const ssize_t total_device = libusb_get_device_list(context, &libusb_list); @@ -523,7 +523,7 @@ static LIBUSB_DEVICE* udev_get_libusb_dev(libusb_context* context, uint8_t bus_n static LIBUSB_DEVICE_DESCRIPTOR* udev_new_descript(URBDRC_PLUGIN* urbdrc, LIBUSB_DEVICE* libusb_dev) { - int ret; + int ret = 0; LIBUSB_DEVICE_DESCRIPTOR* descriptor = (LIBUSB_DEVICE_DESCRIPTOR*)calloc(1, sizeof(LIBUSB_DEVICE_DESCRIPTOR)); if (!descriptor) @@ -544,9 +544,9 @@ static int libusb_udev_select_interface(IUDEVICE* idev, BYTE InterfaceNumber, BY int error = 0; int diff = 0; UDEVICE* pdev = (UDEVICE*)idev; - URBDRC_PLUGIN* urbdrc; - MSUSB_CONFIG_DESCRIPTOR* MsConfig; - MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces; + URBDRC_PLUGIN* urbdrc = NULL; + MSUSB_CONFIG_DESCRIPTOR* MsConfig = NULL; + MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces = NULL; if (!pdev || !pdev->urbdrc) return -1; @@ -587,18 +587,18 @@ static MSUSB_CONFIG_DESCRIPTOR* libusb_udev_complete_msconfig_setup(IUDEVICE* idev, MSUSB_CONFIG_DESCRIPTOR* MsConfig) { UDEVICE* pdev = (UDEVICE*)idev; - MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces; - MSUSB_INTERFACE_DESCRIPTOR* MsInterface; - MSUSB_PIPE_DESCRIPTOR** MsPipes; - MSUSB_PIPE_DESCRIPTOR* MsPipe; - MSUSB_PIPE_DESCRIPTOR** t_MsPipes; - MSUSB_PIPE_DESCRIPTOR* t_MsPipe; - LIBUSB_CONFIG_DESCRIPTOR* LibusbConfig; - const LIBUSB_INTERFACE* LibusbInterface; - const LIBUSB_INTERFACE_DESCRIPTOR* LibusbAltsetting; - const LIBUSB_ENDPOINT_DESCEIPTOR* LibusbEndpoint; - BYTE LibusbNumEndpoint; - URBDRC_PLUGIN* urbdrc; + MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces = NULL; + MSUSB_INTERFACE_DESCRIPTOR* MsInterface = NULL; + MSUSB_PIPE_DESCRIPTOR** MsPipes = NULL; + MSUSB_PIPE_DESCRIPTOR* MsPipe = NULL; + MSUSB_PIPE_DESCRIPTOR** t_MsPipes = NULL; + MSUSB_PIPE_DESCRIPTOR* t_MsPipe = NULL; + LIBUSB_CONFIG_DESCRIPTOR* LibusbConfig = NULL; + const LIBUSB_INTERFACE* LibusbInterface = NULL; + const LIBUSB_INTERFACE_DESCRIPTOR* LibusbAltsetting = NULL; + const LIBUSB_ENDPOINT_DESCEIPTOR* LibusbEndpoint = NULL; + BYTE LibusbNumEndpoint = 0; + URBDRC_PLUGIN* urbdrc = NULL; UINT32 inum = 0; UINT32 pnum = 0; UINT32 MsOutSize = 0; @@ -742,11 +742,11 @@ libusb_udev_complete_msconfig_setup(IUDEVICE* idev, MSUSB_CONFIG_DESCRIPTOR* MsC static int libusb_udev_select_configuration(IUDEVICE* idev, UINT32 bConfigurationValue) { UDEVICE* pdev = (UDEVICE*)idev; - MSUSB_CONFIG_DESCRIPTOR* MsConfig; - LIBUSB_DEVICE_HANDLE* libusb_handle; - LIBUSB_DEVICE* libusb_dev; - URBDRC_PLUGIN* urbdrc; - LIBUSB_CONFIG_DESCRIPTOR** LibusbConfig; + MSUSB_CONFIG_DESCRIPTOR* MsConfig = NULL; + LIBUSB_DEVICE_HANDLE* libusb_handle = NULL; + LIBUSB_DEVICE* libusb_dev = NULL; + URBDRC_PLUGIN* urbdrc = NULL; + LIBUSB_CONFIG_DESCRIPTOR** LibusbConfig = NULL; int ret = 0; if (!pdev || !pdev->MsConfig || !pdev->LibusbConfig || !pdev->urbdrc) @@ -831,18 +831,18 @@ static UINT32 libusb_udev_control_query_device_text(IUDEVICE* idev, UINT32 TextT BYTE* Buffer) { UDEVICE* pdev = (UDEVICE*)idev; - LIBUSB_DEVICE_DESCRIPTOR* devDescriptor; + LIBUSB_DEVICE_DESCRIPTOR* devDescriptor = NULL; const char strDesc[] = "Generic Usb String"; char deviceLocation[25] = { 0 }; - BYTE bus_number; - BYTE device_address; + BYTE bus_number = 0; + BYTE device_address = 0; int ret = 0; - size_t i; - size_t len; - URBDRC_PLUGIN* urbdrc; + size_t i = 0; + size_t len = 0; + URBDRC_PLUGIN* urbdrc = NULL; WCHAR* text = (WCHAR*)Buffer; - BYTE slen; - BYTE locale; + BYTE slen = 0; + BYTE locale = 0; const UINT8 inSize = *BufferSize; *BufferSize = 0; @@ -1030,10 +1030,10 @@ static int libusb_udev_query_device_descriptor(IUDEVICE* idev, int offset) static BOOL libusb_udev_detach_kernel_driver(IUDEVICE* idev) { - int i; + int i = 0; int err = 0; UDEVICE* pdev = (UDEVICE*)idev; - URBDRC_PLUGIN* urbdrc; + URBDRC_PLUGIN* urbdrc = NULL; if (!pdev || !pdev->LibusbConfig || !pdev->libusb_handle || !pdev->urbdrc) return FALSE; @@ -1066,7 +1066,7 @@ static BOOL libusb_udev_detach_kernel_driver(IUDEVICE* idev) static BOOL libusb_udev_attach_kernel_driver(IUDEVICE* idev) { - int i; + int i = 0; int err = 0; UDEVICE* pdev = (UDEVICE*)idev; @@ -1107,7 +1107,7 @@ static int libusb_udev_is_exist(IUDEVICE* idev) static int libusb_udev_is_channel_closed(IUDEVICE* idev) { UDEVICE* pdev = (UDEVICE*)idev; - IUDEVMAN* udevman; + IUDEVMAN* udevman = NULL; if (!pdev || !pdev->urbdrc) return 1; @@ -1188,8 +1188,8 @@ static int libusb_udev_query_device_port_status(IUDEVICE* idev, UINT32* UsbdStat { UDEVICE* pdev = (UDEVICE*)idev; int success = 0; - int ret; - URBDRC_PLUGIN* urbdrc; + int ret = 0; + URBDRC_PLUGIN* urbdrc = NULL; if (!pdev || !pdev->urbdrc) return -1; @@ -1224,12 +1224,12 @@ static int libusb_udev_isoch_transfer(IUDEVICE* idev, GENERIC_CHANNEL_CALLBACK* UINT32 NumberOfPackets, UINT32 BufferSize, const BYTE* Buffer, t_isoch_transfer_cb cb, UINT32 Timeout) { - int rc; + int rc = 0; UINT32 iso_packet_size = 0; UDEVICE* pdev = (UDEVICE*)idev; - ASYNC_TRANSFER_USER_DATA* user_data; + ASYNC_TRANSFER_USER_DATA* user_data = NULL; struct libusb_transfer* iso_transfer = NULL; - URBDRC_PLUGIN* urbdrc; + URBDRC_PLUGIN* urbdrc = NULL; size_t outSize = (NumberOfPackets * 12); uint32_t streamID = 0x40000000 | RequestId; @@ -1321,13 +1321,13 @@ static int libusb_udev_bulk_or_interrupt_transfer(IUDEVICE* idev, BOOL NoAck, UINT32 BufferSize, const BYTE* data, t_isoch_transfer_cb cb, UINT32 Timeout) { - int rc; - UINT32 transfer_type; + int rc = 0; + UINT32 transfer_type = 0; UDEVICE* pdev = (UDEVICE*)idev; - const LIBUSB_ENDPOINT_DESCEIPTOR* ep_desc; + const LIBUSB_ENDPOINT_DESCEIPTOR* ep_desc = NULL; struct libusb_transfer* transfer = NULL; - URBDRC_PLUGIN* urbdrc; - ASYNC_TRANSFER_USER_DATA* user_data; + URBDRC_PLUGIN* urbdrc = NULL; + ASYNC_TRANSFER_USER_DATA* user_data = NULL; uint32_t streamID = 0x80000000 | RequestId; if (!pdev || !pdev->LibusbConfig || !pdev->urbdrc) @@ -1406,7 +1406,7 @@ static int libusb_udev_bulk_or_interrupt_transfer(IUDEVICE* idev, static int func_cancel_xact_request(URBDRC_PLUGIN* urbdrc, struct libusb_transfer* transfer) { - int status; + int status = 0; if (!urbdrc || !transfer) return -1; @@ -1427,8 +1427,8 @@ static int func_cancel_xact_request(URBDRC_PLUGIN* urbdrc, struct libusb_transfe static void libusb_udev_cancel_all_transfer_request(IUDEVICE* idev) { UDEVICE* pdev = (UDEVICE*)idev; - size_t count; - size_t x; + size_t count = 0; + size_t x = 0; if (!pdev || !pdev->request_queue || !pdev->urbdrc) return; @@ -1449,7 +1449,7 @@ static int libusb_udev_cancel_transfer_request(IUDEVICE* idev, UINT32 RequestId) { int rc = -1; UDEVICE* pdev = (UDEVICE*)idev; - struct libusb_transfer* transfer; + struct libusb_transfer* transfer = NULL; uint32_t cancelID1 = 0x40000000 | RequestId; uint32_t cancelID2 = 0x80000000 | RequestId; @@ -1505,9 +1505,9 @@ static void udev_set_UsbDevice(IUDEVICE* idev, UINT32 val) static void udev_free(IUDEVICE* idev) { - int rc; + int rc = 0; UDEVICE* udev = (UDEVICE*)idev; - URBDRC_PLUGIN* urbdrc; + URBDRC_PLUGIN* urbdrc = NULL; if (!idev || !udev->urbdrc) return; @@ -1587,7 +1587,7 @@ static int udev_get_device_handle(URBDRC_PLUGIN* urbdrc, libusb_context* ctx, UD UINT16 bus_number, UINT16 dev_number) { int error = -1; - ssize_t i; + ssize_t i = 0; uint8_t port_numbers[16] = { 0 }; LIBUSB_DEVICE** libusb_list = NULL; const ssize_t total_device = libusb_get_device_list(ctx, &libusb_list); @@ -1642,7 +1642,7 @@ static int udev_get_hub_handle(URBDRC_PLUGIN* urbdrc, libusb_context* ctx, UDEVI UINT16 bus_number, UINT16 dev_number) { int error = -1; - ssize_t i; + ssize_t i = 0; LIBUSB_DEVICE** libusb_list = NULL; LIBUSB_DEVICE_HANDLE* handle = NULL; const ssize_t total_device = libusb_get_device_list(ctx, &libusb_list); @@ -1679,7 +1679,7 @@ static int udev_get_hub_handle(URBDRC_PLUGIN* urbdrc, libusb_context* ctx, UDEVI static void request_free(void* value) { - ASYNC_TRANSFER_USER_DATA* user_data; + ASYNC_TRANSFER_USER_DATA* user_data = NULL; struct libusb_transfer* transfer = (struct libusb_transfer*)value; if (!transfer) return; @@ -1693,10 +1693,10 @@ static void request_free(void* value) static IUDEVICE* udev_init(URBDRC_PLUGIN* urbdrc, libusb_context* context, LIBUSB_DEVICE* device, BYTE bus_number, BYTE dev_number) { - UDEVICE* pdev; + UDEVICE* pdev = NULL; int status = LIBUSB_ERROR_OTHER; - LIBUSB_DEVICE_DESCRIPTOR* devDescriptor; - LIBUSB_CONFIG_DESCRIPTOR* config_temp; + LIBUSB_DEVICE_DESCRIPTOR* devDescriptor = NULL; + LIBUSB_CONFIG_DESCRIPTOR* config_temp = NULL; LIBUSB_INTERFACE_DESCRIPTOR interface_temp; WINPR_ASSERT(urbdrc); @@ -1808,10 +1808,10 @@ fail: size_t udev_new_by_id(URBDRC_PLUGIN* urbdrc, libusb_context* ctx, UINT16 idVendor, UINT16 idProduct, IUDEVICE*** devArray) { - LIBUSB_DEVICE** libusb_list; - UDEVICE** array; - ssize_t i; - ssize_t total_device; + LIBUSB_DEVICE** libusb_list = NULL; + UDEVICE** array = NULL; + ssize_t i = 0; + ssize_t total_device = 0; size_t num = 0; if (!urbdrc || !devArray) diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c index 6cfb19dea..264f30513 100644 --- a/channels/urbdrc/client/libusb/libusb_udevman.c +++ b/channels/urbdrc/client/libusb/libusb_udevman.c @@ -106,7 +106,7 @@ static BOOL udevman_has_next(IUDEVMAN* idevman) static IUDEVICE* udevman_get_next(IUDEVMAN* idevman) { UDEVMAN* udevman = (UDEVMAN*)idevman; - IUDEVICE* pdev; + IUDEVICE* pdev = NULL; pdev = udevman->idev; udevman->idev = (IUDEVICE*)((UDEVICE*)udevman->idev)->next; return pdev; @@ -143,10 +143,10 @@ static size_t udevman_register_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE { UDEVMAN* udevman = (UDEVMAN*)idevman; IUDEVICE* pdev = NULL; - IUDEVICE** devArray; - URBDRC_PLUGIN* urbdrc; - size_t i; - size_t num; + IUDEVICE** devArray = NULL; + URBDRC_PLUGIN* urbdrc = NULL; + size_t i = 0; + size_t num = 0; size_t addnum = 0; if (!idevman || !idevman->plugin) @@ -160,7 +160,7 @@ static size_t udevman_register_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE if (flag & UDEVMAN_FLAG_ADD_BY_ADDR) { - UINT32 id; + UINT32 id = 0; IUDEVICE* tdev = udev_new_by_addr(urbdrc, udevman->context, bus_number, dev_number); if (tdev == NULL) @@ -202,7 +202,7 @@ static size_t udevman_register_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE for (i = 0; i < num; i++) { - UINT32 id; + UINT32 id = 0; IUDEVICE* tdev = devArray[i]; if (udevman_get_udevice_by_addr(idevman, tdev->get_bus_number(tdev), @@ -252,7 +252,7 @@ static size_t udevman_register_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE static BOOL udevman_unregister_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE dev_number) { UDEVMAN* udevman = (UDEVMAN*)idevman; - UDEVICE* pdev; + UDEVICE* pdev = NULL; UDEVICE* dev = (UDEVICE*)udevman_get_udevice_by_addr(idevman, bus_number, dev_number); if (!dev || !idevman) @@ -375,8 +375,8 @@ static int udevman_is_auto_add(IUDEVMAN* idevman) static IUDEVICE* udevman_get_udevice_by_UsbDevice(IUDEVMAN* idevman, UINT32 UsbDevice) { - UDEVICE* pdev; - URBDRC_PLUGIN* urbdrc; + UDEVICE* pdev = NULL; + URBDRC_PLUGIN* urbdrc = NULL; if (!idevman || !idevman->plugin) return NULL; @@ -406,8 +406,8 @@ static IUDEVICE* udevman_get_udevice_by_UsbDevice(IUDEVMAN* idevman, UINT32 UsbD static IUDEVICE* udevman_get_udevice_by_ChannelID(IUDEVMAN* idevman, UINT32 channelID) { - UDEVICE* pdev; - URBDRC_PLUGIN* urbdrc; + UDEVICE* pdev = NULL; + URBDRC_PLUGIN* urbdrc = NULL; if (!idevman || !idevman->plugin) return NULL; @@ -518,7 +518,7 @@ static BOOL device_is_filtered(struct libusb_device* dev, libusb_hotplug_event event) { char buffer[8192] = { 0 }; - char* what; + char* what = NULL; BOOL filtered = FALSE; append(buffer, sizeof(buffer), usb_interface_class_to_string(desc->bDeviceClass)); if (filter_by_class(desc->bDeviceClass, desc->bDeviceSubClass)) @@ -532,11 +532,11 @@ static BOOL device_is_filtered(struct libusb_device* dev, int rc = libusb_get_active_config_descriptor(dev, &config); if (rc == LIBUSB_SUCCESS) { - uint8_t x; + uint8_t x = 0; for (x = 0; x < config->bNumInterfaces; x++) { - int y; + int y = 0; const struct libusb_interface* ifc = &config->interface[x]; for (y = 0; y < ifc->num_altsetting; y++) { @@ -644,9 +644,9 @@ static BOOL udevman_vid_pid_pair_equals(const void* objA, const void* objB) static BOOL udevman_parse_device_id_addr(const char** str, UINT16* id1, UINT16* id2, UINT16 max, char split_sign, char delimiter) { - char* mid; - char* end; - unsigned long rc; + char* mid = NULL; + char* end = NULL; + unsigned long rc = 0; rc = strtoul(*str, &mid, 16); @@ -676,9 +676,9 @@ static BOOL udevman_parse_device_id_addr(const char** str, UINT16* id1, UINT16* static BOOL urbdrc_udevman_register_devices(UDEVMAN* udevman, const char* devices, BOOL add_by_addr) { const char* pos = devices; - VID_PID_PAIR* idpair; - UINT16 id1; - UINT16 id2; + VID_PID_PAIR* idpair = NULL; + UINT16 id1 = 0; + UINT16 id2 = 0; while (*pos != '\0') { @@ -717,7 +717,7 @@ static BOOL urbdrc_udevman_register_devices(UDEVMAN* udevman, const char* device static UINT urbdrc_udevman_parse_addin_args(UDEVMAN* udevman, const ADDIN_ARGV* args) { - int x; + int x = 0; LPCSTR devices = NULL; for (x = 0; x < args->argc; x++) @@ -791,7 +791,7 @@ static UINT urbdrc_udevman_parse_addin_args(UDEVMAN* udevman, const ADDIN_ARGV* static UINT udevman_listener_created_callback(IUDEVMAN* iudevman) { - UINT status; + UINT status = 0; UDEVMAN* udevman = (UDEVMAN*)iudevman; if (udevman->devices_vid_pid) @@ -901,10 +901,10 @@ static DWORD WINAPI poll_thread(LPVOID lpThreadParameter) FREERDP_ENTRY_POINT(UINT libusb_freerdp_urbdrc_client_subsystem_entry( PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints)) { - wObject* obj; - UINT rc; - UINT status; - UDEVMAN* udevman; + wObject* obj = NULL; + UINT rc = 0; + UINT status = 0; + UDEVMAN* udevman = NULL; const ADDIN_ARGV* args = pEntryPoints->args; udevman = (PUDEVMAN)calloc(1, sizeof(UDEVMAN)); diff --git a/channels/urbdrc/client/urbdrc_main.c b/channels/urbdrc/client/urbdrc_main.c index 2512261b5..96e443d88 100644 --- a/channels/urbdrc/client/urbdrc_main.c +++ b/channels/urbdrc/client/urbdrc_main.c @@ -45,8 +45,8 @@ static IWTSVirtualChannel* get_channel(IUDEVMAN* idevman) { - IWTSVirtualChannelManager* channel_mgr; - URBDRC_PLUGIN* urbdrc; + IWTSVirtualChannelManager* channel_mgr = NULL; + URBDRC_PLUGIN* urbdrc = NULL; if (!idevman) return NULL; @@ -66,11 +66,11 @@ static IWTSVirtualChannel* get_channel(IUDEVMAN* idevman) static int func_container_id_generate(IUDEVICE* pdev, char* strContainerId) { - char* p; - char* path; + char* p = NULL; + char* path = NULL; UINT8 containerId[17] = { 0 }; - UINT16 idVendor; - UINT16 idProduct; + UINT16 idVendor = 0; + UINT16 idProduct = 0; idVendor = (UINT16)pdev->query_device_descriptor(pdev, ID_VENDOR); idProduct = (UINT16)pdev->query_device_descriptor(pdev, ID_PRODUCT); path = pdev->getPath(pdev); @@ -118,10 +118,10 @@ static int func_instance_id_generate(IUDEVICE* pdev, char* strInstanceId, size_t static UINT urbdrc_process_capability_request(GENERIC_CHANNEL_CALLBACK* callback, wStream* s, UINT32 MessageId) { - UINT32 InterfaceId; - UINT32 Version; - UINT32 out_size; - wStream* out; + UINT32 InterfaceId = 0; + UINT32 Version = 0; + UINT32 out_size = 0; + wStream* out = NULL; if (!callback || !s) return ERROR_INVALID_PARAMETER; @@ -156,13 +156,13 @@ static UINT urbdrc_process_capability_request(GENERIC_CHANNEL_CALLBACK* callback static UINT urbdrc_process_channel_create(GENERIC_CHANNEL_CALLBACK* callback, wStream* s, UINT32 MessageId) { - UINT32 InterfaceId; - UINT32 out_size; - UINT32 MajorVersion; - UINT32 MinorVersion; - UINT32 Capabilities; - wStream* out; - URBDRC_PLUGIN* urbdrc; + UINT32 InterfaceId = 0; + UINT32 out_size = 0; + UINT32 MajorVersion = 0; + UINT32 MinorVersion = 0; + UINT32 Capabilities = 0; + wStream* out = NULL; + URBDRC_PLUGIN* urbdrc = NULL; if (!callback || !s || !callback->plugin) return ERROR_INVALID_PARAMETER; @@ -224,21 +224,21 @@ static UINT urdbrc_send_virtual_channel_add(IWTSPlugin* plugin, IWTSVirtualChann */ static UINT urdbrc_send_usb_device_add(GENERIC_CHANNEL_CALLBACK* callback, IUDEVICE* pdev) { - wStream* out; - UINT32 InterfaceId; + wStream* out = NULL; + UINT32 InterfaceId = 0; char HardwareIds[2][DEVICE_HARDWARE_ID_SIZE] = { { 0 } }; char CompatibilityIds[3][DEVICE_COMPATIBILITY_ID_SIZE] = { { 0 } }; char strContainerId[DEVICE_CONTAINER_STR_SIZE] = { 0 }; char strInstanceId[DEVICE_INSTANCE_STR_SIZE] = { 0 }; const char* composite_str = "USB\\COMPOSITE"; const size_t composite_len = 13; - size_t size; + size_t size = 0; size_t CompatibilityIdLen[3]; size_t HardwareIdsLen[2]; - size_t ContainerIdLen; - size_t InstanceIdLen; - size_t cchCompatIds; - UINT32 bcdUSB; + size_t ContainerIdLen = 0; + size_t InstanceIdLen = 0; + size_t cchCompatIds = 0; + UINT32 bcdUSB = 0; InterfaceId = ((STREAM_ID_PROXY << 30) | CLIENT_DEVICE_SINK); /* USB kernel driver detach!! */ pdev->detach_kernel_driver(pdev); @@ -381,9 +381,9 @@ fail: */ static UINT urbdrc_exchange_capabilities(GENERIC_CHANNEL_CALLBACK* callback, wStream* data) { - UINT32 MessageId; - UINT32 FunctionId; - UINT32 InterfaceId; + UINT32 MessageId = 0; + UINT32 FunctionId = 0; + UINT32 InterfaceId = 0; UINT error = CHANNEL_RC_OK; if (!data) @@ -510,11 +510,11 @@ fail: */ static UINT urbdrc_process_channel_notification(GENERIC_CHANNEL_CALLBACK* callback, wStream* data) { - UINT32 MessageId; - UINT32 FunctionId; - UINT32 InterfaceId; + UINT32 MessageId = 0; + UINT32 FunctionId = 0; + UINT32 InterfaceId = 0; UINT error = CHANNEL_RC_OK; - URBDRC_PLUGIN* urbdrc; + URBDRC_PLUGIN* urbdrc = NULL; if (!callback || !data) return ERROR_INVALID_PARAMETER; @@ -561,9 +561,9 @@ static UINT urbdrc_process_channel_notification(GENERIC_CHANNEL_CALLBACK* callba static UINT urbdrc_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* data) { GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; - URBDRC_PLUGIN* urbdrc; - IUDEVMAN* udevman; - UINT32 InterfaceId; + URBDRC_PLUGIN* urbdrc = NULL; + IUDEVMAN* udevman = NULL; + UINT32 InterfaceId = 0; UINT error = ERROR_INTERNAL_ERROR; if (callback == NULL) @@ -649,7 +649,7 @@ static UINT urbdrc_on_new_channel_connection(IWTSListenerCallback* pListenerCall IWTSVirtualChannelCallback** ppCallback) { GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; - GENERIC_CHANNEL_CALLBACK* callback; + GENERIC_CHANNEL_CALLBACK* callback = NULL; if (!ppCallback) return ERROR_INVALID_PARAMETER; @@ -675,9 +675,9 @@ static UINT urbdrc_on_new_channel_connection(IWTSListenerCallback* pListenerCall */ static UINT urbdrc_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelManager* pChannelMgr) { - UINT status; + UINT status = 0; URBDRC_PLUGIN* urbdrc = (URBDRC_PLUGIN*)pPlugin; - IUDEVMAN* udevman; + IUDEVMAN* udevman = NULL; char channelName[sizeof(URBDRC_CHANNEL_NAME)] = { URBDRC_CHANNEL_NAME }; if (!urbdrc || !urbdrc->udevman) @@ -722,7 +722,7 @@ static UINT urbdrc_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelMana static UINT urbdrc_plugin_terminated(IWTSPlugin* pPlugin) { URBDRC_PLUGIN* urbdrc = (URBDRC_PLUGIN*)pPlugin; - IUDEVMAN* udevman; + IUDEVMAN* udevman = NULL; if (!urbdrc) return ERROR_INVALID_DATA; @@ -769,7 +769,7 @@ static BOOL urbdrc_register_udevman_addin(IWTSPlugin* pPlugin, IUDEVMAN* udevman static UINT urbdrc_load_udevman_addin(IWTSPlugin* pPlugin, LPCSTR name, const ADDIN_ARGV* args) { URBDRC_PLUGIN* urbdrc = (URBDRC_PLUGIN*)pPlugin; - PFREERDP_URBDRC_DEVICE_ENTRY entry; + PFREERDP_URBDRC_DEVICE_ENTRY entry = NULL; FREERDP_URBDRC_SERVICE_ENTRY_POINTS entryPoints; entry = (PFREERDP_URBDRC_DEVICE_ENTRY)freerdp_load_channel_addin_entry(URBDRC_CHANNEL_NAME, name, NULL, 0); @@ -804,7 +804,7 @@ static BOOL urbdrc_set_subsystem(URBDRC_PLUGIN* urbdrc, const char* subsystem) */ static UINT urbdrc_process_addin_args(URBDRC_PLUGIN* urbdrc, const ADDIN_ARGV* args) { - int status; + int status = 0; COMMAND_LINE_ARGUMENT_A urbdrc_args[] = { { "dbg", COMMAND_LINE_VALUE_FLAG, "", NULL, BoolValueFalse, -1, NULL, "debug" }, { "sys", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "subsystem" }, @@ -817,7 +817,7 @@ static UINT urbdrc_process_addin_args(URBDRC_PLUGIN* urbdrc, const ADDIN_ARGV* a const DWORD flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; - const COMMAND_LINE_ARGUMENT_A* arg; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; status = CommandLineParseArgumentsA(args->argc, args->argv, urbdrc_args, flags, urbdrc, NULL, NULL); @@ -853,8 +853,8 @@ BOOL add_device(IUDEVMAN* idevman, UINT32 flags, BYTE busnum, BYTE devnum, UINT1 UINT16 idProduct) { size_t success = 0; - URBDRC_PLUGIN* urbdrc; - UINT32 mask; + URBDRC_PLUGIN* urbdrc = NULL; + UINT32 mask = 0; UINT32 regflags = 0; if (!idevman) @@ -887,7 +887,7 @@ BOOL del_device(IUDEVMAN* idevman, UINT32 flags, BYTE busnum, BYTE devnum, UINT1 UINT16 idProduct) { IUDEVICE* pdev = NULL; - URBDRC_PLUGIN* urbdrc; + URBDRC_PLUGIN* urbdrc = NULL; if (!idevman) return FALSE; @@ -953,8 +953,8 @@ BOOL del_device(IUDEVMAN* idevman, UINT32 flags, BYTE busnum, BYTE devnum, UINT1 FREERDP_ENTRY_POINT(UINT urbdrc_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)) { UINT status = 0; - const ADDIN_ARGV* args; - URBDRC_PLUGIN* urbdrc; + const ADDIN_ARGV* args = NULL; + URBDRC_PLUGIN* urbdrc = NULL; urbdrc = (URBDRC_PLUGIN*)pEntryPoints->GetPlugin(pEntryPoints, URBDRC_CHANNEL_NAME); args = pEntryPoints->GetPluginData(pEntryPoints); @@ -998,7 +998,7 @@ fail: UINT stream_write_and_free(IWTSPlugin* plugin, IWTSVirtualChannel* channel, wStream* out) { - UINT rc; + UINT rc = 0; URBDRC_PLUGIN* urbdrc = (URBDRC_PLUGIN*)plugin; if (!out) diff --git a/channels/urbdrc/common/msusb.c b/channels/urbdrc/common/msusb.c index 2b2f40ad1..b4fb2b26f 100644 --- a/channels/urbdrc/common/msusb.c +++ b/channels/urbdrc/common/msusb.c @@ -61,8 +61,8 @@ BOOL msusb_mspipes_replace(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, static MSUSB_PIPE_DESCRIPTOR** msusb_mspipes_read(wStream* s, UINT32 NumberOfPipes) { - UINT32 pnum; - MSUSB_PIPE_DESCRIPTOR** MsPipes; + UINT32 pnum = 0; + MSUSB_PIPE_DESCRIPTOR** MsPipes = NULL; if (!Stream_CheckAndLogRequiredCapacityOfSize(TAG, (s), NumberOfPipes, 12ull)) return NULL; @@ -147,7 +147,7 @@ BOOL msusb_msinterface_replace(MSUSB_CONFIG_DESCRIPTOR* MsConfig, BYTE Interface MSUSB_INTERFACE_DESCRIPTOR* msusb_msinterface_read(wStream* s) { - MSUSB_INTERFACE_DESCRIPTOR* MsInterface; + MSUSB_INTERFACE_DESCRIPTOR* MsInterface = NULL; if (!Stream_CheckAndLogRequiredCapacity(TAG, (s), 12)) return NULL; @@ -186,8 +186,8 @@ out_error: BOOL msusb_msinterface_write(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, wStream* out) { - MSUSB_PIPE_DESCRIPTOR** MsPipes; - MSUSB_PIPE_DESCRIPTOR* MsPipe; + MSUSB_PIPE_DESCRIPTOR** MsPipes = NULL; + MSUSB_PIPE_DESCRIPTOR* MsPipe = NULL; UINT32 pnum = 0; if (!MsInterface) @@ -241,8 +241,8 @@ BOOL msusb_msinterface_write(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, wStream* o static MSUSB_INTERFACE_DESCRIPTOR** msusb_msinterface_read_list(wStream* s, UINT32 NumInterfaces) { - UINT32 inum; - MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces; + UINT32 inum = 0; + MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces = NULL; MsInterfaces = (MSUSB_INTERFACE_DESCRIPTOR**)calloc(NumInterfaces, sizeof(MSUSB_INTERFACE_DESCRIPTOR*)); @@ -270,8 +270,8 @@ fail: BOOL msusb_msconfig_write(MSUSB_CONFIG_DESCRIPTOR* MsConfg, wStream* out) { UINT32 inum = 0; - MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces; - MSUSB_INTERFACE_DESCRIPTOR* MsInterface; + MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces = NULL; + MSUSB_INTERFACE_DESCRIPTOR* MsInterface = NULL; if (!MsConfg) return FALSE; @@ -314,9 +314,9 @@ void msusb_msconfig_free(MSUSB_CONFIG_DESCRIPTOR* MsConfig) MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_read(wStream* s, UINT32 NumInterfaces) { - MSUSB_CONFIG_DESCRIPTOR* MsConfig; - BYTE lenConfiguration; - BYTE typeConfiguration; + MSUSB_CONFIG_DESCRIPTOR* MsConfig = NULL; + BYTE lenConfiguration = 0; + BYTE typeConfiguration = 0; if (!Stream_CheckAndLogRequiredCapacityOfSize(TAG, (s), 3ULL + NumInterfaces, 2ULL)) return NULL; @@ -353,10 +353,10 @@ fail: void msusb_msconfig_dump(MSUSB_CONFIG_DESCRIPTOR* MsConfig) { - MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces; - MSUSB_INTERFACE_DESCRIPTOR* MsInterface; - MSUSB_PIPE_DESCRIPTOR** MsPipes; - MSUSB_PIPE_DESCRIPTOR* MsPipe; + MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces = NULL; + MSUSB_INTERFACE_DESCRIPTOR* MsInterface = NULL; + MSUSB_PIPE_DESCRIPTOR** MsPipes = NULL; + MSUSB_PIPE_DESCRIPTOR* MsPipe = NULL; UINT32 inum = 0; UINT32 pnum = 0; WLog_INFO(TAG, "=================MsConfig:========================"); diff --git a/channels/urbdrc/common/urbdrc_helpers.c b/channels/urbdrc/common/urbdrc_helpers.c index 9c55a4904..9d6bb2431 100644 --- a/channels/urbdrc/common/urbdrc_helpers.c +++ b/channels/urbdrc/common/urbdrc_helpers.c @@ -386,11 +386,11 @@ const char* urb_function_string(UINT16 urb) void urbdrc_dump_message(wLog* log, BOOL client, BOOL write, wStream* s) { const char* type = write ? "WRITE" : "READ"; - UINT32 InterfaceId; - UINT32 MessageId; - UINT32 FunctionId; - size_t length; - size_t pos; + UINT32 InterfaceId = 0; + UINT32 MessageId = 0; + UINT32 FunctionId = 0; + size_t length = 0; + size_t pos = 0; pos = Stream_GetPosition(s); if (write) diff --git a/channels/video/client/video_main.c b/channels/video/client/video_main.c index 22403a225..b41e82c45 100644 --- a/channels/video/client/video_main.c +++ b/channels/video/client/video_main.c @@ -132,7 +132,7 @@ static void video_client_context_set_geometry(VideoClientContext* video, static VideoClientContextPriv* VideoClientContextPriv_new(VideoClientContext* video) { - VideoClientContextPriv* ret; + VideoClientContextPriv* ret = NULL; WINPR_ASSERT(video); ret = calloc(1, sizeof(*ret)); @@ -184,8 +184,8 @@ static PresentationContext* PresentationContext_new(VideoClientContext* video, B UINT32 x, UINT32 y, UINT32 width, UINT32 height) { size_t s = width * height * 4ULL; - VideoClientContextPriv* priv; - PresentationContext* ret; + VideoClientContextPriv* priv = NULL; + PresentationContext* ret = NULL; WINPR_ASSERT(video); @@ -237,8 +237,8 @@ fail: static void PresentationContext_unref(PresentationContext** ppresentation) { - PresentationContext* presentation; - MAPPED_GEOMETRY* geometry; + PresentationContext* presentation = NULL; + MAPPED_GEOMETRY* geometry = NULL; WINPR_ASSERT(ppresentation); @@ -267,7 +267,7 @@ static void PresentationContext_unref(PresentationContext** ppresentation) static void VideoFrame_free(VideoFrame** pframe) { - VideoFrame* frame; + VideoFrame* frame = NULL; WINPR_ASSERT(pframe); frame = *pframe; @@ -288,8 +288,8 @@ static void VideoFrame_free(VideoFrame** pframe) static VideoFrame* VideoFrame_new(VideoClientContextPriv* priv, PresentationContext* presentation, MAPPED_GEOMETRY* geom) { - VideoFrame* frame; - const VideoSurface* surface; + VideoFrame* frame = NULL; + const VideoSurface* surface = NULL; WINPR_ASSERT(priv); WINPR_ASSERT(presentation); @@ -358,10 +358,10 @@ static UINT video_control_send_presentation_response(VideoClientContext* context TSMM_PRESENTATION_RESPONSE* resp) { BYTE buf[12] = { 0 }; - wStream* s; - VIDEO_PLUGIN* video; - IWTSVirtualChannel* channel; - UINT ret; + wStream* s = NULL; + VIDEO_PLUGIN* video = NULL; + IWTSVirtualChannel* channel = NULL; + UINT ret = 0; WINPR_ASSERT(context); WINPR_ASSERT(resp); @@ -388,8 +388,8 @@ static UINT video_control_send_presentation_response(VideoClientContext* context static BOOL video_onMappedGeometryUpdate(MAPPED_GEOMETRY* geometry) { - PresentationContext* presentation; - RDP_RECT* r; + PresentationContext* presentation = NULL; + RDP_RECT* r = NULL; WINPR_ASSERT(geometry); @@ -418,7 +418,7 @@ static BOOL video_onMappedGeometryUpdate(MAPPED_GEOMETRY* geometry) static BOOL video_onMappedGeometryClear(MAPPED_GEOMETRY* geometry) { - PresentationContext* presentation; + PresentationContext* presentation = NULL; WINPR_ASSERT(geometry); @@ -443,7 +443,7 @@ static UINT video_PresentationRequest(VideoClientContext* video, if (req->Command == TSMM_START_PRESENTATION) { - MAPPED_GEOMETRY* geom; + MAPPED_GEOMETRY* geom = NULL; TSMM_PRESENTATION_RESPONSE resp; if (memcmp(req->VideoSubtypeId, MFVideoFormat_H264, 16) != 0) @@ -572,11 +572,11 @@ static UINT video_read_tsmm_presentation_req(VideoClientContext* context, wStrea static UINT video_control_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* s) { GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; - VIDEO_PLUGIN* video; - VideoClientContext* context; + VIDEO_PLUGIN* video = NULL; + VideoClientContext* context = NULL; UINT ret = CHANNEL_RC_OK; - UINT32 cbSize; - UINT32 packetType; + UINT32 cbSize = 0; + UINT32 packetType = 0; WINPR_ASSERT(callback); WINPR_ASSERT(s); @@ -618,11 +618,11 @@ static UINT video_control_send_client_notification(VideoClientContext* context, const TSMM_CLIENT_NOTIFICATION* notif) { BYTE buf[100]; - wStream* s; - VIDEO_PLUGIN* video; - IWTSVirtualChannel* channel; - UINT ret; - UINT32 cbSize; + wStream* s = NULL; + VIDEO_PLUGIN* video = NULL; + IWTSVirtualChannel* channel = NULL; + UINT ret = 0; + UINT32 cbSize = 0; WINPR_ASSERT(context); WINPR_ASSERT(notif); @@ -675,9 +675,9 @@ static UINT video_control_send_client_notification(VideoClientContext* context, static void video_timer(VideoClientContext* video, UINT64 now) { - PresentationContext* presentation; - VideoClientContextPriv* priv; - VideoFrame* peekFrame; + PresentationContext* presentation = NULL; + VideoClientContextPriv* priv = NULL; + VideoFrame* peekFrame = NULL; VideoFrame* frame = NULL; WINPR_ASSERT(video); @@ -728,7 +728,7 @@ treat_feedback: */ if (priv->publishedFrames && priv->currentPresentation) { - UINT32 computedRate; + UINT32 computedRate = 0; PresentationContext_ref(priv->currentPresentation); @@ -805,9 +805,9 @@ treat_feedback: static UINT video_VideoData(VideoClientContext* context, const TSMM_VIDEO_DATA* data) { - VideoClientContextPriv* priv; - PresentationContext* presentation; - int status; + VideoClientContextPriv* priv = NULL; + PresentationContext* presentation = NULL; + int status = 0; WINPR_ASSERT(context); WINPR_ASSERT(data); @@ -842,7 +842,7 @@ static UINT video_VideoData(VideoClientContext* context, const TSMM_VIDEO_DATA* VideoSurface* surface = presentation->surface; H264_CONTEXT* h264 = presentation->h264; UINT64 startTime = GetTickCount64(); - UINT64 timeAfterH264; + UINT64 timeAfterH264 = 0; MAPPED_GEOMETRY* geom = presentation->geometry; const RECTANGLE_16 rect = { 0, 0, surface->alignedWidth, surface->alignedHeight }; @@ -894,7 +894,7 @@ static UINT video_VideoData(VideoClientContext* context, const TSMM_VIDEO_DATA* } else { - BOOL enqueueResult; + BOOL enqueueResult = 0; VideoFrame* frame = VideoFrame_new(priv, presentation, geom); if (!frame) { @@ -933,10 +933,10 @@ static UINT video_VideoData(VideoClientContext* context, const TSMM_VIDEO_DATA* static UINT video_data_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* s) { GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; - VIDEO_PLUGIN* video; - VideoClientContext* context; - UINT32 cbSize; - UINT32 packetType; + VIDEO_PLUGIN* video = NULL; + VideoClientContext* context = NULL; + UINT32 cbSize = 0; + UINT32 packetType = 0; TSMM_VIDEO_DATA data; video = (VIDEO_PLUGIN*)callback->plugin; @@ -1017,7 +1017,7 @@ static UINT video_control_on_new_channel_connection(IWTSListenerCallback* listen BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - GENERIC_CHANNEL_CALLBACK* callback; + GENERIC_CHANNEL_CALLBACK* callback = NULL; GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)listenerCallback; WINPR_UNUSED(Data); @@ -1047,7 +1047,7 @@ static UINT video_data_on_new_channel_connection(IWTSListenerCallback* pListener BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - GENERIC_CHANNEL_CALLBACK* callback; + GENERIC_CHANNEL_CALLBACK* callback = NULL; GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; WINPR_UNUSED(Data); @@ -1079,9 +1079,9 @@ static UINT video_data_on_new_channel_connection(IWTSListenerCallback* pListener */ static UINT video_plugin_initialize(IWTSPlugin* plugin, IWTSVirtualChannelManager* channelMgr) { - UINT status; + UINT status = 0; VIDEO_PLUGIN* video = (VIDEO_PLUGIN*)plugin; - GENERIC_LISTENER_CALLBACK* callback; + GENERIC_LISTENER_CALLBACK* callback = NULL; if (video->initialized) { @@ -1172,9 +1172,9 @@ static UINT video_plugin_terminated(IWTSPlugin* pPlugin) FREERDP_ENTRY_POINT(UINT video_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)) { UINT error = CHANNEL_RC_OK; - VIDEO_PLUGIN* videoPlugin; - VideoClientContext* videoContext; - VideoClientContextPriv* priv; + VIDEO_PLUGIN* videoPlugin = NULL; + VideoClientContext* videoContext = NULL; + VideoClientContextPriv* priv = NULL; videoPlugin = (VIDEO_PLUGIN*)pEntryPoints->GetPlugin(pEntryPoints, "video"); if (!videoPlugin) diff --git a/client/SDL/aad/wrapper/webview.h b/client/SDL/aad/wrapper/webview.h index 19e07e8ef..4919265b6 100644 --- a/client/SDL/aad/wrapper/webview.h +++ b/client/SDL/aad/wrapper/webview.h @@ -508,8 +508,8 @@ namespace webview inline std::string json_parse(const std::string& s, const std::string& key, const int index) { - const char* value; - size_t value_sz; + const char* value = nullptr; + size_t value_sz = 0; if (key.empty()) { json_parse_c(s.c_str(), s.length(), nullptr, index, &value, &value_sz); @@ -765,7 +765,7 @@ namespace webview static char* get_string_from_js_result(WebKitJavascriptResult* r) { - char* s; + char* s = nullptr; #if WEBKIT_MAJOR_VERSION >= 2 && WEBKIT_MINOR_VERSION >= 22 JSCValue* value = webkit_javascript_result_get_js_value(r); s = jsc_value_to_string(value); diff --git a/client/SDL/dialogs/sdl_widget.cpp b/client/SDL/dialogs/sdl_widget.cpp index c953b9656..205963691 100644 --- a/client/SDL/dialogs/sdl_widget.cpp +++ b/client/SDL/dialogs/sdl_widget.cpp @@ -194,7 +194,7 @@ bool SdlWidget::fill(SDL_Renderer* renderer, SDL_Color color) bool SdlWidget::fill(SDL_Renderer* renderer, const std::vector& colors) { assert(renderer); - SDL_BlendMode mode; + SDL_BlendMode mode = SDL_BLENDMODE_INVALID; SDL_GetRenderDrawBlendMode(renderer, &mode); SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_NONE); for (auto color : colors) diff --git a/client/SDL/sdl_freerdp.cpp b/client/SDL/sdl_freerdp.cpp index bcc6b211b..2b5749c93 100644 --- a/client/SDL/sdl_freerdp.cpp +++ b/client/SDL/sdl_freerdp.cpp @@ -208,7 +208,7 @@ static const struct sdl_exit_code_map_t sdl_exit_code_map[] = { static const struct sdl_exit_code_map_t* sdl_map_entry_by_code(int exit_code) { - size_t x; + size_t x = 0; for (x = 0; x < ARRAYSIZE(sdl_exit_code_map); x++) { const struct sdl_exit_code_map_t* cur = &sdl_exit_code_map[x]; @@ -220,7 +220,7 @@ static const struct sdl_exit_code_map_t* sdl_map_entry_by_code(int exit_code) static const struct sdl_exit_code_map_t* sdl_map_entry_by_error(DWORD error) { - size_t x; + size_t x = 0; for (x = 0; x < ARRAYSIZE(sdl_exit_code_map); x++) { const struct sdl_exit_code_map_t* cur = &sdl_exit_code_map[x]; @@ -274,7 +274,7 @@ static int error_info_to_error(freerdp* instance, DWORD* pcode, char** msg, size * It can be used to reset invalidated areas. */ static BOOL sdl_begin_paint(rdpContext* context) { - rdpGdi* gdi; + rdpGdi* gdi = nullptr; auto sdl = get_context(context); WINPR_ASSERT(sdl); @@ -391,8 +391,8 @@ static BOOL sdl_draw_to_window(SdlContext* sdl, SdlWindow& window, SDL_Surface* screen = SDL_GetWindowSurface(window.window()); - int w; - int h; + int w = 0; + int h = 0; SDL_GetWindowSize(window.window(), &w, &h); if (!freerdp_settings_get_bool(context->settings, FreeRDP_SmartSizing)) @@ -436,7 +436,7 @@ static BOOL sdl_draw_to_window(SdlContext* sdl, std::vector& windows, static BOOL sdl_end_paint_process(rdpContext* context) { - rdpGdi* gdi; + rdpGdi* gdi = nullptr; auto sdl = get_context(context); WINPR_ASSERT(context); @@ -494,7 +494,7 @@ static void sdl_destroy_primary(SdlContext* sdl) /* Create a SDL surface from the GDI buffer */ static BOOL sdl_create_primary(SdlContext* sdl) { - rdpGdi* gdi; + rdpGdi* gdi = nullptr; WINPR_ASSERT(sdl); @@ -522,8 +522,8 @@ static BOOL sdl_create_primary(SdlContext* sdl) static BOOL sdl_desktop_resize(rdpContext* context) { - rdpGdi* gdi; - rdpSettings* settings; + rdpGdi* gdi = nullptr; + rdpSettings* settings = nullptr; auto sdl = get_context(context); WINPR_ASSERT(sdl); @@ -644,10 +644,10 @@ static BOOL sdl_pre_connect(freerdp* instance) static const char* sdl_window_get_title(rdpSettings* settings) { - const char* windowTitle; - UINT32 port; - BOOL addPort; - const char* name; + const char* windowTitle = nullptr; + UINT32 port = 0; + BOOL addPort = 0; + const char* name = nullptr; const char* prefix = "FreeRDP:"; if (!settings) @@ -754,8 +754,8 @@ static BOOL sdl_create_windows(SdlContext* sdl) if (freerdp_settings_get_bool(settings, FreeRDP_UseMultimon)) { - int win_x; - int win_y; + int win_x = 0; + int win_y = 0; SDL_GetWindowPosition(window.window(), &win_x, &win_y); window.setOffsetX(0 - win_x); window.setOffsetY(0 - win_y); @@ -1193,8 +1193,8 @@ static void sdl_post_final_disconnect(freerdp* instance) * after the connection ends. */ static DWORD WINAPI sdl_client_thread_proc(SdlContext* sdl) { - DWORD nCount; - DWORD status; + DWORD nCount = 0; + DWORD status = 0; int exit_code = SDL_EXIT_SUCCESS; char* error_msg = NULL; size_t error_msg_len = 0; @@ -1597,7 +1597,7 @@ static void SDLCALL winpr_LogOutputFunction(void* userdata, int category, SDL_Lo int main(int argc, char* argv[]) { int rc = -1; - int status; + int status = 0; RDP_CLIENT_ENTRY_POINTS clientEntryPoints = {}; freerdp_client_warn_experimental(argc, argv); diff --git a/client/SDL/sdl_monitor.cpp b/client/SDL/sdl_monitor.cpp index faca0e8aa..aceb0095e 100644 --- a/client/SDL/sdl_monitor.cpp +++ b/client/SDL/sdl_monitor.cpp @@ -79,8 +79,8 @@ int sdl_list_monitors(SdlContext* sdl) static BOOL sdl_is_monitor_id_active(SdlContext* sdl, UINT32 id) { - UINT32 index; - const rdpSettings* settings; + UINT32 index = 0; + const rdpSettings* settings = nullptr; WINPR_ASSERT(sdl); diff --git a/client/SDL/sdl_pointer.cpp b/client/SDL/sdl_pointer.cpp index f137e9a3c..ecbb38bf3 100644 --- a/client/SDL/sdl_pointer.cpp +++ b/client/SDL/sdl_pointer.cpp @@ -107,12 +107,12 @@ static BOOL sdl_Pointer_Set(rdpContext* context, rdpPointer* pointer) BOOL sdl_Pointer_Set_Process(SDL_UserEvent* uptr) { - INT32 w; - INT32 h; - INT32 x; - INT32 y; - INT32 sw; - INT32 sh; + INT32 w = 0; + INT32 h = 0; + INT32 x = 0; + INT32 y = 0; + INT32 sw = 0; + INT32 sh = 0; WINPR_ASSERT(uptr); diff --git a/client/SDL/sdl_touch.cpp b/client/SDL/sdl_touch.cpp index b95e55dac..0b20c4873 100644 --- a/client/SDL/sdl_touch.cpp +++ b/client/SDL/sdl_touch.cpp @@ -35,7 +35,7 @@ BOOL sdl_scale_coordinates(SdlContext* sdl, Uint32 windowId, INT32* px, INT32* py, BOOL fromLocalToRDP, BOOL applyOffset) { - rdpGdi* gdi; + rdpGdi* gdi = nullptr; double sx = 1.0; double sy = 1.0; @@ -56,8 +56,8 @@ BOOL sdl_scale_coordinates(SdlContext* sdl, Uint32 windowId, INT32* px, INT32* p int offset_y = 0; for (const auto& window : sdl->windows) { - int w; - int h; + int w = 0; + int h = 0; const Uint32 id = SDL_GetWindowID(window.window()); if (id != windowId) { @@ -97,7 +97,7 @@ BOOL sdl_scale_coordinates(SdlContext* sdl, Uint32 windowId, INT32* px, INT32* p static BOOL sdl_get_touch_scaled(SdlContext* sdl, const SDL_TouchFingerEvent* ev, INT32* px, INT32* py, BOOL local) { - Uint32 windowID; + Uint32 windowID = 0; WINPR_ASSERT(sdl); WINPR_ASSERT(ev); @@ -163,8 +163,8 @@ BOOL sdl_handle_touch_up(SdlContext* sdl, const SDL_TouchFingerEvent* ev) WINPR_ASSERT(sdl); WINPR_ASSERT(ev); - INT32 x; - INT32 y; + INT32 x = 0; + INT32 y = 0; if (!sdl_get_touch_scaled(sdl, ev, &x, &y, TRUE)) return FALSE; return freerdp_client_handle_touch(sdl->common(), FREERDP_TOUCH_UP | FREERDP_TOUCH_HAS_PRESSURE, @@ -177,8 +177,8 @@ BOOL sdl_handle_touch_down(SdlContext* sdl, const SDL_TouchFingerEvent* ev) WINPR_ASSERT(sdl); WINPR_ASSERT(ev); - INT32 x; - INT32 y; + INT32 x = 0; + INT32 y = 0; if (!sdl_get_touch_scaled(sdl, ev, &x, &y, TRUE)) return FALSE; return freerdp_client_handle_touch( @@ -191,8 +191,8 @@ BOOL sdl_handle_touch_motion(SdlContext* sdl, const SDL_TouchFingerEvent* ev) WINPR_ASSERT(sdl); WINPR_ASSERT(ev); - INT32 x; - INT32 y; + INT32 x = 0; + INT32 y = 0; if (!sdl_get_touch_scaled(sdl, ev, &x, &y, TRUE)) return FALSE; return freerdp_client_handle_touch( diff --git a/client/Sample/tf_freerdp.c b/client/Sample/tf_freerdp.c index aceb2ca95..2a799fcd3 100644 --- a/client/Sample/tf_freerdp.c +++ b/client/Sample/tf_freerdp.c @@ -51,7 +51,7 @@ * It can be used to reset invalidated areas. */ static BOOL tf_begin_paint(rdpContext* context) { - rdpGdi* gdi; + rdpGdi* gdi = NULL; WINPR_ASSERT(context); @@ -71,7 +71,7 @@ static BOOL tf_begin_paint(rdpContext* context) */ static BOOL tf_end_paint(rdpContext* context) { - rdpGdi* gdi; + rdpGdi* gdi = NULL; WINPR_ASSERT(context); @@ -90,8 +90,8 @@ static BOOL tf_end_paint(rdpContext* context) static BOOL tf_desktop_resize(rdpContext* context) { - rdpGdi* gdi; - rdpSettings* settings; + rdpGdi* gdi = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(context); @@ -139,7 +139,7 @@ static BOOL tf_keyboard_set_ime_status(rdpContext* context, UINT16 imeId, UINT32 * Set all configuration options to support and load channels here. */ static BOOL tf_pre_connect(freerdp* instance) { - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(instance); WINPR_ASSERT(instance->context); @@ -175,7 +175,7 @@ static BOOL tf_pre_connect(freerdp* instance) */ static BOOL tf_post_connect(freerdp* instance) { - rdpContext* context; + rdpContext* context = NULL; if (!gdi_init(instance, PIXEL_FORMAT_XRGB32)) return FALSE; @@ -205,7 +205,7 @@ static BOOL tf_post_connect(freerdp* instance) */ static void tf_post_disconnect(freerdp* instance) { - tfContext* context; + tfContext* context = NULL; if (!instance) return; @@ -229,8 +229,8 @@ static void tf_post_disconnect(freerdp* instance) static DWORD WINAPI tf_client_thread_proc(LPVOID arg) { freerdp* instance = (freerdp*)arg; - DWORD nCount; - DWORD status; + DWORD nCount = 0; + DWORD status = 0; DWORD result = 0; HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 }; BOOL rc = freerdp_connect(instance); @@ -302,7 +302,7 @@ static void tf_client_global_uninit(void) static int tf_logon_error_info(freerdp* instance, UINT32 data, UINT32 type) { - tfContext* tf; + tfContext* tf = NULL; const char* str_data = freerdp_get_logon_error_info_data(data); const char* str_type = freerdp_get_logon_error_info_type(type); @@ -377,9 +377,9 @@ static int RdpClientEntry(RDP_CLIENT_ENTRY_POINTS* pEntryPoints) int main(int argc, char* argv[]) { int rc = -1; - DWORD status; + DWORD status = 0; RDP_CLIENT_ENTRY_POINTS clientEntryPoints; - rdpContext* context; + rdpContext* context = NULL; RdpClientEntry(&clientEntryPoints); context = freerdp_client_context_new(&clientEntryPoints); diff --git a/client/Wayland/wlf_cliprdr.c b/client/Wayland/wlf_cliprdr.c index 95ca5e966..dbd1413cf 100644 --- a/client/Wayland/wlf_cliprdr.c +++ b/client/Wayland/wlf_cliprdr.c @@ -143,7 +143,7 @@ static BOOL wlf_mime_is_file(const char* mime) static BOOL wlf_mime_is_text(const char* mime) { - size_t x; + size_t x = 0; for (x = 0; x < ARRAYSIZE(mime_text); x++) { @@ -156,7 +156,7 @@ static BOOL wlf_mime_is_text(const char* mime) static BOOL wlf_mime_is_image(const char* mime) { - size_t x; + size_t x = 0; for (x = 0; x < ARRAYSIZE(mime_image); x++) { @@ -426,7 +426,7 @@ static UINT wlf_cliprdr_send_client_format_list_response(wfClipboard* clipboard, static UINT wlf_cliprdr_monitor_ready(CliprdrClientContext* context, const CLIPRDR_MONITOR_READY* monitorReady) { - UINT ret; + UINT ret = 0; WINPR_UNUSED(monitorReady); WINPR_ASSERT(context); @@ -673,7 +673,7 @@ static UINT wlf_cliprdr_server_format_list(CliprdrClientContext* context, if (text) { - size_t x; + size_t x = 0; for (x = 0; x < ARRAYSIZE(mime_text); x++) UwacClipboardOfferCreate(clipboard->seat, mime_text[x]); @@ -912,8 +912,8 @@ fail: wfClipboard* wlf_clipboard_new(wlfContext* wfc) { - rdpChannels* channels; - wfClipboard* clipboard; + rdpChannels* channels = NULL; + wfClipboard* clipboard = NULL; WINPR_ASSERT(wfc); diff --git a/client/Wayland/wlf_disp.c b/client/Wayland/wlf_disp.c index de03faa9d..67407e52e 100644 --- a/client/Wayland/wlf_disp.c +++ b/client/Wayland/wlf_disp.c @@ -48,7 +48,7 @@ static UINT wlf_disp_sendLayout(DispClientContext* disp, const rdpMonitor* monit static BOOL wlf_disp_settings_changed(wlfDispContext* wlfDisp) { - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(wlfDisp); WINPR_ASSERT(wlfDisp->wlc); @@ -82,7 +82,7 @@ static BOOL wlf_disp_settings_changed(wlfDispContext* wlfDisp) static BOOL wlf_update_last_sent(wlfDispContext* wlfDisp) { - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(wlfDisp); WINPR_ASSERT(wlfDisp->wlc); @@ -105,8 +105,8 @@ static BOOL wlf_update_last_sent(wlfDispContext* wlfDisp) static BOOL wlf_disp_sendResize(wlfDispContext* wlfDisp) { DISPLAY_CONTROL_MONITOR_LAYOUT layout; - wlfContext* wlc; - rdpSettings* settings; + wlfContext* wlc = NULL; + rdpSettings* settings = NULL; if (!wlfDisp || !wlfDisp->wlc) return FALSE; @@ -167,7 +167,7 @@ static BOOL wlf_disp_set_window_resizable(wlfDispContext* wlfDisp) static BOOL wlf_disp_check_context(void* context, wlfContext** ppwlc, wlfDispContext** ppwlfDisp, rdpSettings** ppSettings) { - wlfContext* wlc; + wlfContext* wlc = NULL; if (!context) return FALSE; @@ -188,9 +188,9 @@ static BOOL wlf_disp_check_context(void* context, wlfContext** ppwlc, wlfDispCon static void wlf_disp_OnActivated(void* context, const ActivatedEventArgs* e) { - wlfContext* wlc; - wlfDispContext* wlfDisp; - rdpSettings* settings; + wlfContext* wlc = NULL; + wlfDispContext* wlfDisp = NULL; + rdpSettings* settings = NULL; if (!wlf_disp_check_context(context, &wlc, &wlfDisp, &settings)) return; @@ -210,9 +210,9 @@ static void wlf_disp_OnActivated(void* context, const ActivatedEventArgs* e) static void wlf_disp_OnGraphicsReset(void* context, const GraphicsResetEventArgs* e) { - wlfContext* wlc; - wlfDispContext* wlfDisp; - rdpSettings* settings; + wlfContext* wlc = NULL; + wlfDispContext* wlfDisp = NULL; + rdpSettings* settings = NULL; WINPR_UNUSED(e); if (!wlf_disp_check_context(context, &wlc, &wlfDisp, &settings)) @@ -229,9 +229,9 @@ static void wlf_disp_OnGraphicsReset(void* context, const GraphicsResetEventArgs static void wlf_disp_OnTimer(void* context, const TimerEventArgs* e) { - wlfContext* wlc; - wlfDispContext* wlfDisp; - rdpSettings* settings; + wlfContext* wlc = NULL; + wlfDispContext* wlfDisp = NULL; + rdpSettings* settings = NULL; WINPR_UNUSED(e); if (!wlf_disp_check_context(context, &wlc, &wlfDisp, &settings)) @@ -245,9 +245,9 @@ static void wlf_disp_OnTimer(void* context, const TimerEventArgs* e) wlfDispContext* wlf_disp_new(wlfContext* wlc) { - wlfDispContext* ret; - wPubSub* pubSub; - rdpSettings* settings; + wlfDispContext* ret = NULL; + wPubSub* pubSub = NULL; + rdpSettings* settings = NULL; if (!wlc || !wlc->common.context.settings || !wlc->common.context.pubSub) return NULL; @@ -289,10 +289,10 @@ void wlf_disp_free(wlfDispContext* disp) UINT wlf_disp_sendLayout(DispClientContext* disp, const rdpMonitor* monitors, size_t nmonitors) { UINT ret = CHANNEL_RC_OK; - DISPLAY_CONTROL_MONITOR_LAYOUT* layouts; - size_t i; - wlfDispContext* wlfDisp; - rdpSettings* settings; + DISPLAY_CONTROL_MONITOR_LAYOUT* layouts = NULL; + size_t i = 0; + wlfDispContext* wlfDisp = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(disp); WINPR_ASSERT(monitors); @@ -376,8 +376,8 @@ static UINT wlf_DisplayControlCaps(DispClientContext* disp, UINT32 maxNumMonitor UINT32 maxMonitorAreaFactorA, UINT32 maxMonitorAreaFactorB) { /* we're called only if dynamic resolution update is activated */ - wlfDispContext* wlfDisp; - rdpSettings* settings; + wlfDispContext* wlfDisp = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(disp); @@ -403,7 +403,7 @@ static UINT wlf_DisplayControlCaps(DispClientContext* disp, UINT32 maxNumMonitor BOOL wlf_disp_init(wlfDispContext* wlfDisp, DispClientContext* disp) { - rdpSettings* settings; + rdpSettings* settings = NULL; if (!wlfDisp || !wlfDisp->wlc || !disp) return FALSE; @@ -435,10 +435,9 @@ BOOL wlf_disp_uninit(wlfDispContext* wlfDisp, DispClientContext* disp) int wlf_list_monitors(wlfContext* wlc) { - uint32_t i; uint32_t nmonitors = UwacDisplayGetNbOutputs(wlc->display); - for (i = 0; i < nmonitors; i++) + for (uint32_t i = 0; i < nmonitors; i++) { const UwacOutput* monitor = UwacDisplayGetOutput(wlc->display, i); UwacSize resolution; diff --git a/client/Wayland/wlf_input.c b/client/Wayland/wlf_input.c index 9747b2f4b..16c7886ce 100644 --- a/client/Wayland/wlf_input.c +++ b/client/Wayland/wlf_input.c @@ -40,9 +40,9 @@ static BOOL scale_signed_coordinates(rdpContext* context, int32_t* x, int32_t* y, BOOL fromLocalToRDP) { - BOOL rc; - UINT32 ux; - UINT32 uy; + BOOL rc = 0; + UINT32 ux = 0; + UINT32 uy = 0; WINPR_ASSERT(context); WINPR_ASSERT(x); WINPR_ASSERT(y); @@ -61,9 +61,9 @@ static BOOL scale_signed_coordinates(rdpContext* context, int32_t* x, int32_t* y BOOL wlf_handle_pointer_enter(freerdp* instance, const UwacPointerEnterLeaveEvent* ev) { - uint32_t x; - uint32_t y; - rdpClientContext* cctx; + uint32_t x = 0; + uint32_t y = 0; + rdpClientContext* cctx = NULL; if (!instance || !ev) return FALSE; @@ -82,9 +82,9 @@ BOOL wlf_handle_pointer_enter(freerdp* instance, const UwacPointerEnterLeaveEven BOOL wlf_handle_pointer_motion(freerdp* instance, const UwacPointerMotionEvent* ev) { - uint32_t x; - uint32_t y; - rdpClientContext* cctx; + uint32_t x = 0; + uint32_t y = 0; + rdpClientContext* cctx = NULL; if (!instance || !ev) return FALSE; @@ -105,11 +105,11 @@ BOOL wlf_handle_pointer_motion(freerdp* instance, const UwacPointerMotionEvent* BOOL wlf_handle_pointer_buttons(freerdp* instance, const UwacPointerButtonEvent* ev) { - rdpClientContext* cctx; + rdpClientContext* cctx = NULL; UINT16 flags = 0; UINT16 xflags = 0; - uint32_t x; - uint32_t y; + uint32_t x = 0; + uint32_t y = 0; if (!instance || !ev) return FALSE; @@ -169,7 +169,7 @@ BOOL wlf_handle_pointer_buttons(freerdp* instance, const UwacPointerButtonEvent* BOOL wlf_handle_pointer_axis(freerdp* instance, const UwacPointerAxisEvent* ev) { - wlfContext* context; + wlfContext* context = NULL; if (!instance || !instance->context || !ev) return FALSE; @@ -179,7 +179,7 @@ BOOL wlf_handle_pointer_axis(freerdp* instance, const UwacPointerAxisEvent* ev) BOOL wlf_handle_pointer_axis_discrete(freerdp* instance, const UwacPointerAxisEvent* ev) { - wlfContext* context; + wlfContext* context = NULL; if (!instance || !instance->context || !ev) return FALSE; @@ -190,9 +190,9 @@ BOOL wlf_handle_pointer_axis_discrete(freerdp* instance, const UwacPointerAxisEv static BOOL wlf_handle_wheel(freerdp* instance, uint32_t x, uint32_t y, uint32_t axis, int32_t value) { - rdpClientContext* cctx; + rdpClientContext* cctx = NULL; UINT16 flags = 0; - int32_t direction; + int32_t direction = 0; uint32_t avalue = (uint32_t)abs(value); WINPR_ASSERT(instance); @@ -247,8 +247,8 @@ BOOL wlf_handle_pointer_frame(freerdp* instance, const UwacPointerFrameEvent* ev { BOOL success = TRUE; BOOL handle = FALSE; - size_t x; - wlfContext* context; + size_t x = 0; + wlfContext* context = NULL; enum wl_pointer_axis_source source = WL_POINTER_AXIS_SOURCE_CONTINUOUS; if (!instance || !ev || !instance->context) @@ -317,7 +317,7 @@ BOOL wlf_handle_pointer_frame(freerdp* instance, const UwacPointerFrameEvent* ev BOOL wlf_handle_pointer_source(freerdp* instance, const UwacPointerSourceEvent* ev) { - wlfContext* context; + wlfContext* context = NULL; if (!instance || !instance->context || !ev) return FALSE; @@ -327,8 +327,8 @@ BOOL wlf_handle_pointer_source(freerdp* instance, const UwacPointerSourceEvent* BOOL wlf_handle_key(freerdp* instance, const UwacKeyEvent* ev) { - rdpInput* input; - DWORD rdp_scancode; + rdpInput* input = NULL; + DWORD rdp_scancode = 0; if (!instance || !ev) return FALSE; @@ -349,7 +349,7 @@ BOOL wlf_handle_key(freerdp* instance, const UwacKeyEvent* ev) BOOL wlf_handle_ungrab_key(freerdp* instance, const UwacKeyEvent* ev) { - wlfContext* context; + wlfContext* context = NULL; if (!instance || !instance->context || !ev) return FALSE; @@ -369,9 +369,9 @@ BOOL wlf_keyboard_enter(freerdp* instance, const UwacKeyboardEnterLeaveEvent* ev BOOL wlf_keyboard_modifiers(freerdp* instance, const UwacKeyboardModifiersEvent* ev) { - rdpInput* input; - UINT16 syncFlags; - wlfContext* wlf; + rdpInput* input = NULL; + UINT16 syncFlags = 0; + wlfContext* wlf = NULL; if (!instance || !ev) return FALSE; @@ -400,8 +400,8 @@ BOOL wlf_keyboard_modifiers(freerdp* instance, const UwacKeyboardModifiersEvent* BOOL wlf_handle_touch_up(freerdp* instance, const UwacTouchUp* ev) { - int32_t x; - int32_t y; + int32_t x = 0; + int32_t y = 0; WINPR_ASSERT(instance); WINPR_ASSERT(ev); @@ -420,8 +420,8 @@ BOOL wlf_handle_touch_up(freerdp* instance, const UwacTouchUp* ev) BOOL wlf_handle_touch_down(freerdp* instance, const UwacTouchDown* ev) { - int32_t x; - int32_t y; + int32_t x = 0; + int32_t y = 0; WINPR_ASSERT(instance); WINPR_ASSERT(ev); @@ -440,8 +440,8 @@ BOOL wlf_handle_touch_down(freerdp* instance, const UwacTouchDown* ev) BOOL wlf_handle_touch_motion(freerdp* instance, const UwacTouchMotion* ev) { - int32_t x; - int32_t y; + int32_t x = 0; + int32_t y = 0; WINPR_ASSERT(instance); WINPR_ASSERT(ev); diff --git a/client/Wayland/wlf_pointer.c b/client/Wayland/wlf_pointer.c index 0185ec04c..6fba40bbe 100644 --- a/client/Wayland/wlf_pointer.c +++ b/client/Wayland/wlf_pointer.c @@ -70,13 +70,13 @@ static BOOL wlf_Pointer_Set(rdpContext* context, rdpPointer* pointer) { wlfContext* wlf = (wlfContext*)context; wlfPointer* ptr = (wlfPointer*)pointer; - void* data; - UINT32 w; - UINT32 h; - UINT32 x; - UINT32 y; - size_t size; - UwacReturnCode rc; + void* data = NULL; + UINT32 w = 0; + UINT32 h = 0; + UINT32 x = 0; + UINT32 y = 0; + size_t size = 0; + UwacReturnCode rc = UWAC_ERROR_INTERNAL; BOOL res = FALSE; RECTANGLE_16 area; diff --git a/client/Wayland/wlfreerdp.c b/client/Wayland/wlfreerdp.c index c1678ff22..5360ec008 100644 --- a/client/Wayland/wlfreerdp.c +++ b/client/Wayland/wlfreerdp.c @@ -19,6 +19,7 @@ * limitations under the License. */ +#include #include #include #include @@ -49,15 +50,15 @@ static BOOL wl_update_buffer(wlfContext* context_w, INT32 ix, INT32 iy, INT32 iw, INT32 ih) { BOOL res = FALSE; - rdpGdi* gdi; - char* data; - UINT32 x; - UINT32 y; - UINT32 w; - UINT32 h; + rdpGdi* gdi = NULL; + char* data = NULL; + UINT32 x = 0; + UINT32 y = 0; + UINT32 w = 0; + UINT32 h = 0; UwacSize geometry; - size_t stride; - UwacReturnCode rc; + size_t stride = 0; + UwacReturnCode rc = UWAC_ERROR_INTERNAL; RECTANGLE_16 area; if (!context_w) @@ -120,12 +121,12 @@ fail: static BOOL wl_end_paint(rdpContext* context) { - rdpGdi* gdi; - wlfContext* context_w; - INT32 x; - INT32 y; - INT32 w; - INT32 h; + rdpGdi* gdi = NULL; + wlfContext* context_w = NULL; + INT32 x = 0; + INT32 y = 0; + INT32 w = 0; + INT32 h = 0; if (!context || !context->gdi || !context->gdi->primary) return FALSE; @@ -152,7 +153,7 @@ static BOOL wl_end_paint(rdpContext* context) static BOOL wl_refresh_display(wlfContext* context) { - rdpGdi* gdi; + rdpGdi* gdi = NULL; if (!context || !context->common.context.gdi) return FALSE; @@ -176,9 +177,9 @@ static BOOL wl_resize_display(rdpContext* context) static BOOL wl_pre_connect(freerdp* instance) { - rdpSettings* settings; - wlfContext* context; - const UwacOutput* output; + rdpSettings* settings = NULL; + wlfContext* context = NULL; + const UwacOutput* output = NULL; UwacSize resolution; if (!instance) @@ -223,14 +224,14 @@ static BOOL wl_pre_connect(freerdp* instance) static BOOL wl_post_connect(freerdp* instance) { - rdpGdi* gdi; - UwacWindow* window; - wlfContext* context; - rdpSettings* settings; + rdpGdi* gdi = NULL; + UwacWindow* window = NULL; + wlfContext* context = NULL; + rdpSettings* settings = NULL; char* title = "FreeRDP"; char* app_id = "wlfreerdp"; - UINT32 w; - UINT32 h; + UINT32 w = 0; + UINT32 h = 0; if (!instance || !instance->context) return FALSE; @@ -299,7 +300,7 @@ static BOOL wl_post_connect(freerdp* instance) static void wl_post_disconnect(freerdp* instance) { - wlfContext* context; + wlfContext* context = NULL; if (!instance) return; @@ -319,7 +320,7 @@ static void wl_post_disconnect(freerdp* instance) static BOOL handle_uwac_events(freerdp* instance, UwacDisplay* display) { UwacEvent event; - wlfContext* context; + wlfContext* context = NULL; if (UwacDisplayDispatch(display, 1) < 0) return FALSE; @@ -344,9 +345,8 @@ static BOOL handle_uwac_events(freerdp* instance, UwacDisplay* display) case UWAC_EVENT_FRAME_DONE: { - UwacReturnCode r; EnterCriticalSection(&context->critical); - r = UwacWindowSubmitBuffer(context->window, false); + UwacReturnCode r = UwacWindowSubmitBuffer(context->window, false); LeaveCriticalSection(&context->critical); if (r != UWAC_SUCCESS) return FALSE; @@ -470,7 +470,7 @@ static BOOL handle_window_events(freerdp* instance) static int wlfreerdp_run(freerdp* instance) { - wlfContext* context; + wlfContext* context = NULL; HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 }; DWORD status = WAIT_ABANDONED; HANDLE timer = NULL; @@ -592,7 +592,7 @@ static void wlf_client_global_uninit(void) static int wlf_logon_error_info(freerdp* instance, UINT32 data, UINT32 type) { - wlfContext* wlf; + wlfContext* wlf = NULL; const char* str_data = freerdp_get_logon_error_info_data(data); const char* str_type = freerdp_get_logon_error_info_type(type); @@ -622,7 +622,7 @@ static void wlf_client_free(freerdp* instance, rdpContext* context) static void* uwac_event_clone(const void* val) { - UwacEvent* copy; + UwacEvent* copy = NULL; const UwacEvent* ev = (const UwacEvent*)val; copy = calloc(1, sizeof(UwacEvent)); @@ -634,8 +634,8 @@ static void* uwac_event_clone(const void* val) static BOOL wlf_client_new(freerdp* instance, rdpContext* context) { - wObject* obj; - UwacReturnCode status; + wObject* obj = NULL; + UwacReturnCode status = UWAC_ERROR_INTERNAL; wlfContext* wfl = (wlfContext*)context; if (!instance || !context) @@ -695,11 +695,11 @@ static int RdpClientEntry(RDP_CLIENT_ENTRY_POINTS* pEntryPoints) int main(int argc, char* argv[]) { int rc = -1; - int status; + int status = 0; RDP_CLIENT_ENTRY_POINTS clientEntryPoints; - rdpContext* context; - rdpSettings* settings; - wlfContext* wlc; + rdpContext* context = NULL; + rdpSettings* settings = NULL; + wlfContext* wlc = NULL; freerdp_client_warn_deprecated(argc, argv); @@ -750,7 +750,7 @@ BOOL wlf_copy_image(const void* src, size_t srcStride, size_t srcWidth, size_t s } else { - size_t i; + size_t i = 0; const size_t baseSrcOffset = area->top * srcStride + area->left * 4; const size_t baseDstOffset = area->top * dstStride + area->left * 4; const size_t width = MIN((size_t)area->right - area->left, dstWidth - area->left); @@ -774,10 +774,10 @@ BOOL wlf_copy_image(const void* src, size_t srcStride, size_t srcWidth, size_t s BOOL wlf_scale_coordinates(rdpContext* context, UINT32* px, UINT32* py, BOOL fromLocalToRDP) { wlfContext* wlf = (wlfContext*)context; - rdpGdi* gdi; + rdpGdi* gdi = NULL; UwacSize geometry; - double sx; - double sy; + double sx = NAN; + double sy = NAN; if (!context || !px || !py || !context->gdi) return FALSE; diff --git a/client/X11/cli/xfreerdp.c b/client/X11/cli/xfreerdp.c index 8c22d3419..33b2a962d 100644 --- a/client/X11/cli/xfreerdp.c +++ b/client/X11/cli/xfreerdp.c @@ -34,12 +34,12 @@ int main(int argc, char* argv[]) { int rc = 1; - int status; - HANDLE thread; - xfContext* xfc; - DWORD dwExitCode; - rdpContext* context; - rdpSettings* settings; + int status = 0; + HANDLE thread = NULL; + xfContext* xfc = NULL; + DWORD dwExitCode = 0; + rdpContext* context = NULL; + rdpSettings* settings = NULL; RDP_CLIENT_ENTRY_POINTS clientEntryPoints = { 0 }; clientEntryPoints.Size = sizeof(RDP_CLIENT_ENTRY_POINTS); diff --git a/client/X11/xf_channels.c b/client/X11/xf_channels.c index d24203826..71776225b 100644 --- a/client/X11/xf_channels.c +++ b/client/X11/xf_channels.c @@ -38,7 +38,7 @@ void xf_OnChannelConnectedEventHandler(void* context, const ChannelConnectedEventArgs* e) { xfContext* xfc = (xfContext*)context; - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(xfc); WINPR_ASSERT(e); @@ -86,7 +86,7 @@ void xf_OnChannelConnectedEventHandler(void* context, const ChannelConnectedEven void xf_OnChannelDisconnectedEventHandler(void* context, const ChannelDisconnectedEventArgs* e) { xfContext* xfc = (xfContext*)context; - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(xfc); WINPR_ASSERT(e); diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c index e0bc90cab..4157431f4 100644 --- a/client/X11/xf_client.c +++ b/client/X11/xf_client.c @@ -24,6 +24,7 @@ #include +#include #include #include @@ -153,7 +154,7 @@ static void xf_teardown_x11(xfContext* xfc); static int xf_map_error_to_exit_code(DWORD error) { - size_t x; + size_t x = 0; for (x = 0; x < ARRAYSIZE(xf_exit_code_map); x++) { const struct xf_exit_code_map_t* cur = &xf_exit_code_map[x]; @@ -173,16 +174,16 @@ static BOOL xf_get_pixmap_info(xfContext* xfc); static void xf_draw_screen_scaled(xfContext* xfc, int x, int y, int w, int h) { XTransform transform; - Picture windowPicture; - Picture primaryPicture; + Picture windowPicture = 0; + Picture primaryPicture = 0; XRenderPictureAttributes pa; - XRenderPictFormat* picFormat; - double xScalingFactor; - double yScalingFactor; - int x2; - int y2; - const char* filter; - rdpSettings* settings; + XRenderPictFormat* picFormat = NULL; + double xScalingFactor = NAN; + double yScalingFactor = NAN; + int x2 = 0; + int y2 = 0; + const char* filter = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(xfc); settings = xfc->common.context.settings; @@ -271,7 +272,7 @@ static void xf_draw_screen_scaled(xfContext* xfc, int x, int y, int w, int h) BOOL xf_picture_transform_required(xfContext* xfc) { - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(xfc); @@ -324,7 +325,7 @@ void xf_draw_screen_(xfContext* xfc, int x, int y, int w, int h, const char* fkt static BOOL xf_desktop_resize(rdpContext* context) { - rdpSettings* settings; + rdpSettings* settings = NULL; xfContext* xfc = (xfContext*)context; WINPR_ASSERT(xfc); @@ -518,9 +519,9 @@ static BOOL xf_process_x_events(freerdp* instance) static char* xf_window_get_title(rdpSettings* settings) { - BOOL port; - char* windowTitle; - size_t size; + BOOL port = 0; + char* windowTitle = NULL; + size_t size = 0; const char* prefix = "FreeRDP:"; if (!settings) @@ -880,9 +881,9 @@ static BOOL xf_play_sound(rdpContext* context, const PLAY_SOUND_UPDATE* play_sou static void xf_check_extensions(xfContext* context) { - int xkb_opcode; - int xkb_event; - int xkb_error; + int xkb_opcode = 0; + int xkb_event = 0; + int xkb_error = 0; int xkb_major = XkbMajorVersion; int xkb_minor = XkbMinorVersion; @@ -895,8 +896,8 @@ static void xf_check_extensions(xfContext* context) #ifdef WITH_XRENDER { - int xrender_event_base; - int xrender_error_base; + int xrender_event_base = 0; + int xrender_error_base = 0; if (XRenderQueryExtension(context->display, &xrender_event_base, &xrender_error_base)) { @@ -916,15 +917,15 @@ static const size_t TEST_PTR_LEN = sizeof(TEST_PTR_STR) / sizeof(char); static void xf_get_x11_button_map(xfContext* xfc, unsigned char* x11_map) { #ifdef WITH_XI - int opcode; - int event; - int error; - XDevice* ptr_dev; - XExtensionVersion* version; - XDeviceInfo* devices1; - XIDeviceInfo* devices2; - int i; - int num_devices; + int opcode = 0; + int event = 0; + int error = 0; + XDevice* ptr_dev = NULL; + XExtensionVersion* version = NULL; + XDeviceInfo* devices1 = NULL; + XIDeviceInfo* devices2 = NULL; + int i = 0; + int num_devices = 0; if (XQueryExtension(xfc->display, "XInputExtension", &opcode, &event, &error)) { @@ -1018,7 +1019,7 @@ static const button_map xf_button_flags[NUM_BUTTONS_MAPPED] = { static UINT16 get_flags_for_button(int button) { - size_t x; + size_t x = 0; for (x = 0; x < ARRAYSIZE(xf_button_flags); x++) { @@ -1035,7 +1036,7 @@ static void xf_button_map_init(xfContext* xfc) { size_t pos = 0; /* loop counter for array initialization */ - size_t physical; + size_t physical = 0; /* logical mouse button which is used for each physical mouse */ /* button (indexed from zero). This is the default map. */ unsigned char x11_map[112] = { 0 }; @@ -1098,10 +1099,10 @@ static void xf_button_map_init(xfContext* xfc) */ static BOOL xf_pre_connect(freerdp* instance) { - rdpChannels* channels; - rdpSettings* settings; - rdpContext* context; - xfContext* xfc; + rdpChannels* channels = NULL; + rdpSettings* settings = NULL; + rdpContext* context = NULL; + xfContext* xfc = NULL; UINT32 maxWidth = 0; UINT32 maxHeight = 0; @@ -1406,8 +1407,8 @@ static BOOL xf_post_connect(freerdp* instance) static void xf_post_disconnect(freerdp* instance) { - xfContext* xfc; - rdpContext* context; + xfContext* xfc = NULL; + rdpContext* context = NULL; if (!instance || !instance->context) return; @@ -1448,8 +1449,8 @@ static void xf_post_disconnect(freerdp* instance) static void xf_post_final_disconnect(freerdp* instance) { - xfContext* xfc; - rdpContext* context; + xfContext* xfc = NULL; + rdpContext* context = NULL; if (!instance || !instance->context) return; @@ -1688,9 +1689,9 @@ static void xf_TerminateEventHandler(void* context, const TerminateEventArgs* e) #ifdef WITH_XRENDER static void xf_ZoomingChangeEventHandler(void* context, const ZoomingChangeEventArgs* e) { - int w; - int h; - rdpSettings* settings; + int w = 0; + int h = 0; + rdpSettings* settings = NULL; xfContext* xfc = (xfContext*)context; WINPR_ASSERT(xfc); @@ -1722,7 +1723,7 @@ static void xf_ZoomingChangeEventHandler(void* context, const ZoomingChangeEvent static void xf_PanningChangeEventHandler(void* context, const PanningChangeEventArgs* e) { xfContext* xfc = (xfContext*)context; - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(xfc); WINPR_ASSERT(e); @@ -1780,7 +1781,7 @@ static int xfreerdp_client_start(rdpContext* context) static Atom get_supported_atom(xfContext* xfc, const char* atomName) { - unsigned long i; + unsigned long i = 0; const Atom atom = XInternAtom(xfc->display, atomName, False); for (i = 0; i < xfc->supportedAtomCount; i++) diff --git a/client/X11/xf_cliprdr.c b/client/X11/xf_cliprdr.c index fcc0d3261..67e725a10 100644 --- a/client/X11/xf_cliprdr.c +++ b/client/X11/xf_cliprdr.c @@ -166,7 +166,7 @@ static void xf_cached_data_free(void* ptr) static xfCachedData* xf_cached_data_new(BYTE* data, UINT32 data_length) { - xfCachedData* cached_data; + xfCachedData* cached_data = NULL; cached_data = calloc(1, sizeof(xfCachedData)); if (!cached_data) @@ -196,8 +196,8 @@ static void xf_clipboard_free_server_formats(xfClipboard* clipboard) static void xf_cliprdr_check_owner(xfClipboard* clipboard) { - Window owner; - xfContext* xfc; + Window owner = 0; + xfContext* xfc = NULL; WINPR_ASSERT(clipboard); @@ -218,7 +218,7 @@ static void xf_cliprdr_check_owner(xfClipboard* clipboard) static BOOL xf_cliprdr_is_self_owned(xfClipboard* clipboard) { - xfContext* xfc; + xfContext* xfc = NULL; WINPR_ASSERT(clipboard); @@ -230,7 +230,7 @@ static BOOL xf_cliprdr_is_self_owned(xfClipboard* clipboard) static void xf_cliprdr_set_raw_transfer_enabled(xfClipboard* clipboard, BOOL enabled) { UINT32 data = enabled; - xfContext* xfc; + xfContext* xfc = NULL; WINPR_ASSERT(clipboard); @@ -242,15 +242,15 @@ static void xf_cliprdr_set_raw_transfer_enabled(xfClipboard* clipboard, BOOL ena static BOOL xf_cliprdr_is_raw_transfer_available(xfClipboard* clipboard) { - Atom type; - int format; + Atom type = 0; + int format = 0; int result = 0; - unsigned long length; - unsigned long bytes_left; + unsigned long length = 0; + unsigned long bytes_left = 0; UINT32* data = NULL; UINT32 is_enabled = 0; Window owner = None; - xfContext* xfc; + xfContext* xfc = NULL; WINPR_ASSERT(clipboard); @@ -423,8 +423,8 @@ static UINT xf_cliprdr_send_data_response(xfClipboard* clipboard, const xfCliprd static wStream* xf_cliprdr_serialize_server_format_list(xfClipboard* clipboard) { - UINT32 i; - UINT32 formatCount; + UINT32 i = 0; + UINT32 formatCount = 0; wStream* s = NULL; WINPR_ASSERT(clipboard); @@ -471,7 +471,7 @@ error: static CLIPRDR_FORMAT* xf_cliprdr_parse_server_format_list(BYTE* data, size_t length, UINT32* numFormats) { - UINT32 i; + UINT32 i = 0; wStream* s = NULL; CLIPRDR_FORMAT* formats = NULL; @@ -535,7 +535,7 @@ error: static void xf_cliprdr_free_formats(CLIPRDR_FORMAT* formats, UINT32 numFormats) { - UINT32 i; + UINT32 i = 0; WINPR_ASSERT(formats || (numFormats == 0)); @@ -552,10 +552,10 @@ static CLIPRDR_FORMAT* xf_cliprdr_get_raw_server_formats(xfClipboard* clipboard, Atom type = None; int format = 0; unsigned long length = 0; - unsigned long remaining; + unsigned long remaining = 0; BYTE* data = NULL; CLIPRDR_FORMAT* formats = NULL; - xfContext* xfc; + xfContext* xfc = NULL; WINPR_ASSERT(clipboard); WINPR_ASSERT(numFormats); @@ -669,7 +669,7 @@ static CLIPRDR_FORMAT* xf_cliprdr_get_client_formats(xfClipboard* clipboard, UIN static void xf_cliprdr_provide_server_format_list(xfClipboard* clipboard) { wStream* formats = NULL; - xfContext* xfc; + xfContext* xfc = NULL; WINPR_ASSERT(clipboard); @@ -709,8 +709,8 @@ static BOOL xf_clipboard_format_equal(const CLIPRDR_FORMAT* a, const CLIPRDR_FOR static BOOL xf_clipboard_changed(xfClipboard* clipboard, const CLIPRDR_FORMAT* formats, UINT32 numFormats) { - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; WINPR_ASSERT(clipboard); WINPR_ASSERT(formats || (numFormats == 0)); @@ -749,7 +749,7 @@ static void xf_clipboard_formats_free(xfClipboard* clipboard) static BOOL xf_clipboard_copy_formats(xfClipboard* clipboard, const CLIPRDR_FORMAT* formats, UINT32 numFormats) { - UINT32 x; + UINT32 x = 0; WINPR_ASSERT(clipboard); WINPR_ASSERT(formats || (numFormats == 0)); @@ -782,7 +782,7 @@ static UINT xf_cliprdr_send_format_list(xfClipboard* clipboard, const CLIPRDR_FO .numFormats = numFormats, .formats = cnv.pv, .common.msgType = CB_FORMAT_LIST }; - UINT ret; + UINT ret = 0; WINPR_ASSERT(clipboard); WINPR_ASSERT(formats || (numFormats == 0)); @@ -825,12 +825,12 @@ static void xf_cliprdr_get_requested_targets(xfClipboard* clipboard) static void xf_cliprdr_process_requested_data(xfClipboard* clipboard, BOOL hasData, BYTE* data, int size) { - BOOL bSuccess; - UINT32 SrcSize; + BOOL bSuccess = 0; + UINT32 SrcSize = 0; UINT32 DstSize = 0; - UINT32 srcFormatId; + UINT32 srcFormatId = 0; BYTE* pDstData = NULL; - const xfCliprdrFormat* format; + const xfCliprdrFormat* format = NULL; WINPR_ASSERT(clipboard); @@ -930,15 +930,15 @@ static void xf_cliprdr_process_requested_data(xfClipboard* clipboard, BOOL hasDa static BOOL xf_cliprdr_get_requested_data(xfClipboard* clipboard, Atom target) { - Atom type; + Atom type = 0; BYTE* data = NULL; BOOL has_data = FALSE; - int format_property; - unsigned long dummy; - unsigned long length; - unsigned long bytes_left; - const xfCliprdrFormat* format; - xfContext* xfc; + int format_property = 0; + unsigned long dummy = 0; + unsigned long length = 0; + unsigned long bytes_left = 0; + const xfCliprdrFormat* format = NULL; + xfContext* xfc = NULL; WINPR_ASSERT(clipboard); @@ -997,7 +997,7 @@ static BOOL xf_cliprdr_get_requested_data(xfClipboard* clipboard, Atom target) { if (clipboard->incr_starts) { - BYTE* new_data; + BYTE* new_data = NULL; bytes_left = length * format_property / 8; new_data = (BYTE*)realloc(clipboard->incr_data, clipboard->incr_data_length + bytes_left); @@ -1048,7 +1048,7 @@ static void xf_cliprdr_append_target(xfClipboard* clipboard, Atom target) static void xf_cliprdr_provide_targets(xfClipboard* clipboard, const XSelectionEvent* respond) { - xfContext* xfc; + xfContext* xfc = NULL; WINPR_ASSERT(clipboard); @@ -1065,7 +1065,7 @@ static void xf_cliprdr_provide_targets(xfClipboard* clipboard, const XSelectionE static void xf_cliprdr_provide_timestamp(xfClipboard* clipboard, const XSelectionEvent* respond) { - xfContext* xfc; + xfContext* xfc = NULL; WINPR_ASSERT(clipboard); @@ -1083,7 +1083,7 @@ static void xf_cliprdr_provide_timestamp(xfClipboard* clipboard, const XSelectio static void xf_cliprdr_provide_data(xfClipboard* clipboard, const XSelectionEvent* respond, const BYTE* data, UINT32 size) { - xfContext* xfc; + xfContext* xfc = NULL; WINPR_ASSERT(clipboard); @@ -1267,9 +1267,9 @@ static xfCachedData* convert_data_from_existing_raw_data(xfClipboard* clipboard, UINT32 srcFormatId, BOOL nullTerminated, UINT32 dstFormatId) { - xfCachedData* cached_data; - BOOL success; - BYTE* dst_data; + xfCachedData* cached_data = NULL; + BOOL success = 0; + BYTE* dst_data = NULL; UINT32 dst_size = 0; WINPR_ASSERT(clipboard); @@ -1324,16 +1324,16 @@ static xfCachedData* convert_data_from_existing_raw_data(xfClipboard* clipboard, static BOOL xf_cliprdr_process_selection_request(xfClipboard* clipboard, const XSelectionRequestEvent* xevent) { - int fmt; - Atom type; - UINT32 formatId; - XSelectionEvent* respond; + int fmt = 0; + Atom type = 0; + UINT32 formatId = 0; + XSelectionEvent* respond = NULL; BYTE* data = NULL; - BOOL delayRespond; - BOOL rawTransfer; - unsigned long length; - unsigned long bytes_left; - xfContext* xfc; + BOOL delayRespond = 0; + BOOL rawTransfer = 0; + unsigned long length = 0; + unsigned long bytes_left = 0; + xfContext* xfc = NULL; WINPR_ASSERT(clipboard); WINPR_ASSERT(xevent); @@ -1383,8 +1383,8 @@ static BOOL xf_cliprdr_process_selection_request(xfClipboard* clipboard, { formatId = format->formatId; rawTransfer = FALSE; - xfCachedData* cached_data; - UINT32 dstFormatId; + xfCachedData* cached_data = NULL; + UINT32 dstFormatId = 0; if (formatId == CF_RAW) { @@ -1418,7 +1418,7 @@ static BOOL xf_cliprdr_process_selection_request(xfClipboard* clipboard, { UINT32 srcFormatId = 0; BOOL nullTerminated = FALSE; - xfCachedData* cached_raw_data; + xfCachedData* cached_raw_data = NULL; get_src_format_info_for_local_request(clipboard, cformat, &srcFormatId, &nullTerminated); @@ -1484,7 +1484,7 @@ static BOOL xf_cliprdr_process_selection_request(xfClipboard* clipboard, static BOOL xf_cliprdr_process_selection_clear(xfClipboard* clipboard, const XSelectionClearEvent* xevent) { - xfContext* xfc; + xfContext* xfc = NULL; WINPR_ASSERT(clipboard); WINPR_ASSERT(xevent); @@ -1503,7 +1503,7 @@ static BOOL xf_cliprdr_process_selection_clear(xfClipboard* clipboard, static BOOL xf_cliprdr_process_property_notify(xfClipboard* clipboard, const XPropertyEvent* xevent) { - const xfCliprdrFormat* format; + const xfCliprdrFormat* format = NULL; xfContext* xfc = NULL; if (!clipboard) @@ -1544,7 +1544,7 @@ static BOOL xf_cliprdr_process_property_notify(xfClipboard* clipboard, const XPr void xf_cliprdr_handle_xevent(xfContext* xfc, const XEvent* event) { - xfClipboard* clipboard; + xfClipboard* clipboard = NULL; if (!xfc || !event) return; @@ -1695,8 +1695,8 @@ static UINT xf_cliprdr_send_client_format_list_response(xfClipboard* clipboard, static UINT xf_cliprdr_monitor_ready(CliprdrClientContext* context, const CLIPRDR_MONITOR_READY* monitorReady) { - UINT ret; - xfClipboard* clipboard; + UINT ret = 0; + xfClipboard* clipboard = NULL; WINPR_ASSERT(context); WINPR_ASSERT(monitorReady); @@ -1726,10 +1726,10 @@ static UINT xf_cliprdr_monitor_ready(CliprdrClientContext* context, static UINT xf_cliprdr_server_capabilities(CliprdrClientContext* context, const CLIPRDR_CAPABILITIES* capabilities) { - UINT32 i; - const CLIPRDR_GENERAL_CAPABILITY_SET* generalCaps; - const BYTE* capsPtr; - xfClipboard* clipboard; + UINT32 i = 0; + const CLIPRDR_GENERAL_CAPABILITY_SET* generalCaps = NULL; + const BYTE* capsPtr = NULL; + xfClipboard* clipboard = NULL; WINPR_ASSERT(context); WINPR_ASSERT(capabilities); @@ -1808,9 +1808,9 @@ static void xf_cliprdr_set_selection_owner(xfContext* xfc, xfClipboard* clipboar static UINT xf_cliprdr_server_format_list(CliprdrClientContext* context, const CLIPRDR_FORMAT_LIST* formatList) { - xfContext* xfc; - UINT ret; - xfClipboard* clipboard; + xfContext* xfc = NULL; + UINT ret = 0; + xfClipboard* clipboard = NULL; WINPR_ASSERT(context); WINPR_ASSERT(formatList); @@ -1853,7 +1853,7 @@ static UINT xf_cliprdr_server_format_list(CliprdrClientContext* context, if (!srvFormat->formatName) { - UINT32 k; + UINT32 k = 0; for (k = 0; k < i; k++) free(clipboard->serverFormats[k].formatName); @@ -1931,11 +1931,11 @@ static UINT xf_cliprdr_server_format_data_request(CliprdrClientContext* context, const CLIPRDR_FORMAT_DATA_REQUEST* formatDataRequest) { - BOOL rawTransfer; + BOOL rawTransfer = 0; const xfCliprdrFormat* format = NULL; - UINT32 formatId; - xfContext* xfc; - xfClipboard* clipboard; + UINT32 formatId = 0; + xfContext* xfc = NULL; + xfClipboard* clipboard = NULL; WINPR_ASSERT(context); WINPR_ASSERT(formatDataRequest); @@ -1982,19 +1982,19 @@ static UINT xf_cliprdr_server_format_data_response(CliprdrClientContext* context, const CLIPRDR_FORMAT_DATA_RESPONSE* formatDataResponse) { - BOOL bSuccess; - BYTE* pDstData; - UINT32 DstSize; - UINT32 SrcSize; - UINT32 srcFormatId; - UINT32 dstFormatId; + BOOL bSuccess = 0; + BYTE* pDstData = NULL; + UINT32 DstSize = 0; + UINT32 SrcSize = 0; + UINT32 srcFormatId = 0; + UINT32 dstFormatId = 0; BOOL nullTerminated = FALSE; - UINT32 size; - const BYTE* data; - xfContext* xfc; - xfClipboard* clipboard; - xfCachedData* cached_data; - BYTE* raw_data; + UINT32 size = 0; + const BYTE* data = NULL; + xfContext* xfc = NULL; + xfClipboard* clipboard = NULL; + xfCachedData* cached_data = NULL; + BYTE* raw_data = NULL; WINPR_ASSERT(context); WINPR_ASSERT(formatDataResponse); @@ -2157,7 +2157,7 @@ xf_cliprdr_server_format_data_response(CliprdrClientContext* context, if (raw_data) { - xfCachedData* cached_raw_data; + xfCachedData* cached_raw_data = NULL; CopyMemory(raw_data, data, size); @@ -2204,7 +2204,7 @@ xf_cliprdr_server_format_data_response(CliprdrClientContext* context, static BOOL xf_cliprdr_is_valid_unix_filename(LPCWSTR filename) { - LPCWSTR c; + LPCWSTR c = NULL; if (!filename) return FALSE; @@ -2225,11 +2225,11 @@ static BOOL xf_cliprdr_is_valid_unix_filename(LPCWSTR filename) xfClipboard* xf_clipboard_new(xfContext* xfc, BOOL relieveFilenameRestriction) { int n = 0; - rdpChannels* channels; - xfClipboard* clipboard; - const char* selectionAtom; - xfCliprdrFormat* clientFormat; - wObject* obj; + rdpChannels* channels = NULL; + xfClipboard* clipboard = NULL; + const char* selectionAtom = NULL; + xfCliprdrFormat* clientFormat = NULL; + wObject* obj = NULL; WINPR_ASSERT(xfc); WINPR_ASSERT(xfc->common.context.settings); @@ -2277,8 +2277,8 @@ xfClipboard* xf_clipboard_new(xfContext* xfc, BOOL relieveFilenameRestriction) if (XFixesQueryExtension(xfc->display, &clipboard->xfixes_event_base, &clipboard->xfixes_error_base)) { - int xfmajor; - int xfminor; + int xfmajor = 0; + int xfminor = 0; if (XFixesQueryVersion(xfc->display, &xfmajor, &xfminor)) { diff --git a/client/X11/xf_disp.c b/client/X11/xf_disp.c index 077e2511d..24b8453b9 100644 --- a/client/X11/xf_disp.c +++ b/client/X11/xf_disp.c @@ -65,7 +65,7 @@ static UINT xf_disp_sendLayout(DispClientContext* disp, const rdpMonitor* monito static BOOL xf_disp_settings_changed(xfDispContext* xfDisp) { - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(xfDisp); WINPR_ASSERT(xfDisp->xfc); @@ -99,7 +99,7 @@ static BOOL xf_disp_settings_changed(xfDispContext* xfDisp) static BOOL xf_update_last_sent(xfDispContext* xfDisp) { - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(xfDisp); WINPR_ASSERT(xfDisp->xfc); @@ -122,8 +122,8 @@ static BOOL xf_update_last_sent(xfDispContext* xfDisp) static BOOL xf_disp_sendResize(xfDispContext* xfDisp) { DISPLAY_CONTROL_MONITOR_LAYOUT layout = { 0 }; - xfContext* xfc; - rdpSettings* settings; + xfContext* xfc = NULL; + rdpSettings* settings = NULL; if (!xfDisp || !xfDisp->xfc) return FALSE; @@ -186,7 +186,7 @@ static BOOL xf_disp_queueResize(xfDispContext* xfDisp, UINT32 width, UINT32 heig static BOOL xf_disp_set_window_resizable(xfDispContext* xfDisp) { - XSizeHints* size_hints; + XSizeHints* size_hints = NULL; if (!(size_hints = XAllocSizeHints())) return FALSE; @@ -206,7 +206,7 @@ static BOOL xf_disp_set_window_resizable(xfDispContext* xfDisp) static BOOL xf_disp_check_context(void* context, xfContext** ppXfc, xfDispContext** ppXfDisp, rdpSettings** ppSettings) { - xfContext* xfc; + xfContext* xfc = NULL; if (!context) return FALSE; @@ -227,9 +227,9 @@ static BOOL xf_disp_check_context(void* context, xfContext** ppXfc, xfDispContex static void xf_disp_OnActivated(void* context, const ActivatedEventArgs* e) { - xfContext* xfc; - xfDispContext* xfDisp; - rdpSettings* settings; + xfContext* xfc = NULL; + xfDispContext* xfDisp = NULL; + rdpSettings* settings = NULL; if (!xf_disp_check_context(context, &xfc, &xfDisp, &settings)) return; @@ -247,9 +247,9 @@ static void xf_disp_OnActivated(void* context, const ActivatedEventArgs* e) static void xf_disp_OnGraphicsReset(void* context, const GraphicsResetEventArgs* e) { - xfContext* xfc; - xfDispContext* xfDisp; - rdpSettings* settings; + xfContext* xfc = NULL; + xfDispContext* xfDisp = NULL; + rdpSettings* settings = NULL; WINPR_UNUSED(e); @@ -265,9 +265,9 @@ static void xf_disp_OnGraphicsReset(void* context, const GraphicsResetEventArgs* static void xf_disp_OnTimer(void* context, const TimerEventArgs* e) { - xfContext* xfc; - xfDispContext* xfDisp; - rdpSettings* settings; + xfContext* xfc = NULL; + xfDispContext* xfDisp = NULL; + rdpSettings* settings = NULL; WINPR_UNUSED(e); @@ -282,9 +282,9 @@ static void xf_disp_OnTimer(void* context, const TimerEventArgs* e) static void xf_disp_OnWindowStateChange(void* context, const WindowStateChangeEventArgs* e) { - xfContext* xfc; - xfDispContext* xfDisp; - rdpSettings* settings; + xfContext* xfc = NULL; + xfDispContext* xfDisp = NULL; + rdpSettings* settings = NULL; WINPR_UNUSED(e); @@ -299,9 +299,9 @@ static void xf_disp_OnWindowStateChange(void* context, const WindowStateChangeEv xfDispContext* xf_disp_new(xfContext* xfc) { - xfDispContext* ret; - const rdpSettings* settings; - wPubSub* pubSub; + xfDispContext* ret = NULL; + const rdpSettings* settings = NULL; + wPubSub* pubSub = NULL; WINPR_ASSERT(xfc); @@ -356,10 +356,10 @@ void xf_disp_free(xfDispContext* disp) UINT xf_disp_sendLayout(DispClientContext* disp, const rdpMonitor* monitors, UINT32 nmonitors) { UINT ret = CHANNEL_RC_OK; - UINT32 i; - xfDispContext* xfDisp; - rdpSettings* settings; - DISPLAY_CONTROL_MONITOR_LAYOUT* layouts; + UINT32 i = 0; + xfDispContext* xfDisp = NULL; + rdpSettings* settings = NULL; + DISPLAY_CONTROL_MONITOR_LAYOUT* layouts = NULL; WINPR_ASSERT(disp); WINPR_ASSERT(monitors); @@ -431,10 +431,10 @@ UINT xf_disp_sendLayout(DispClientContext* disp, const rdpMonitor* monitors, UIN BOOL xf_disp_handle_xevent(xfContext* xfc, const XEvent* event) { - xfDispContext* xfDisp; - rdpSettings* settings; - UINT32 maxWidth; - UINT32 maxHeight; + xfDispContext* xfDisp = NULL; + rdpSettings* settings = NULL; + UINT32 maxWidth = 0; + UINT32 maxHeight = 0; if (!xfc || !event) return FALSE; @@ -466,7 +466,7 @@ BOOL xf_disp_handle_xevent(xfContext* xfc, const XEvent* event) BOOL xf_disp_handle_configureNotify(xfContext* xfc, int width, int height) { - xfDispContext* xfDisp; + xfDispContext* xfDisp = NULL; if (!xfc) return FALSE; @@ -483,8 +483,8 @@ static UINT xf_DisplayControlCaps(DispClientContext* disp, UINT32 maxNumMonitors UINT32 maxMonitorAreaFactorA, UINT32 maxMonitorAreaFactorB) { /* we're called only if dynamic resolution update is activated */ - xfDispContext* xfDisp; - rdpSettings* settings; + xfDispContext* xfDisp = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(disp); @@ -510,7 +510,7 @@ static UINT xf_DisplayControlCaps(DispClientContext* disp, UINT32 maxNumMonitors BOOL xf_disp_init(xfDispContext* xfDisp, DispClientContext* disp) { - rdpSettings* settings; + rdpSettings* settings = NULL; if (!xfDisp || !xfDisp->xfc || !disp) return FALSE; diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c index a7ed8244e..3c0fe667a 100644 --- a/client/X11/xf_event.c +++ b/client/X11/xf_event.c @@ -169,13 +169,13 @@ const char* x11_event_string(int event) BOOL xf_event_action_script_init(xfContext* xfc) { - wObject* obj; - char* xevent; - FILE* actionScript; + wObject* obj = NULL; + char* xevent = NULL; + FILE* actionScript = NULL; char buffer[1024] = { 0 }; char command[1024] = { 0 }; - const rdpSettings* settings; - const char* ActionScript; + const rdpSettings* settings = NULL; + const char* ActionScript = NULL; WINPR_ASSERT(xfc); @@ -226,13 +226,13 @@ void xf_event_action_script_free(xfContext* xfc) static BOOL xf_event_execute_action_script(xfContext* xfc, const XEvent* event) { - int index; - int count; - char* name; - FILE* actionScript; + int index = 0; + int count = 0; + char* name = NULL; + FILE* actionScript = NULL; BOOL match = FALSE; - const char* xeventName; - const char* ActionScript; + const char* xeventName = NULL; + const char* ActionScript = NULL; char buffer[1024] = { 0 }; char command[1024] = { 0 }; @@ -279,9 +279,9 @@ static BOOL xf_event_execute_action_script(xfContext* xfc, const XEvent* event) void xf_adjust_coordinates_to_screen(xfContext* xfc, UINT32* x, UINT32* y) { - rdpSettings* settings; - INT64 tx; - INT64 ty; + rdpSettings* settings = NULL; + INT64 tx = 0; + INT64 ty = 0; if (!xfc || !xfc->common.context.settings || !y || !x) return; @@ -338,11 +338,11 @@ void xf_event_adjust_coordinates(xfContext* xfc, int* x, int* y) static BOOL xf_event_Expose(xfContext* xfc, const XExposeEvent* event, BOOL app) { - int x; - int y; - int w; - int h; - rdpSettings* settings; + int x = 0; + int y = 0; + int w = 0; + int h = 0; + rdpSettings* settings = NULL; WINPR_ASSERT(xfc); WINPR_ASSERT(event); @@ -812,8 +812,8 @@ static BOOL xf_event_ConfigureNotify(xfContext* xfc, const XConfigureEvent* even if (freerdp_settings_get_bool(settings, FreeRDP_DynamicResolutionUpdate)) { - int alignedWidth; - int alignedHeight; + int alignedWidth = 0; + int alignedHeight = 0; alignedWidth = (xfc->window->width / 2) * 2; alignedHeight = (xfc->window->height / 2) * 2; /* ask the server to resize using the display channel */ @@ -1267,7 +1267,7 @@ BOOL xf_event_process(freerdp* instance, const XEvent* event) BOOL xf_generic_RawButtonEvent(xfContext* xfc, int button, BOOL app, BOOL down) { UINT16 flags = 0; - size_t i; + size_t i = 0; if (app) return FALSE; diff --git a/client/X11/xf_floatbar.c b/client/X11/xf_floatbar.c index 2ed47d4ee..2d6122720 100644 --- a/client/X11/xf_floatbar.c +++ b/client/X11/xf_floatbar.c @@ -107,7 +107,7 @@ static BOOL xf_floatbar_button_onclick_close(xfFloatbar* floatbar) static BOOL xf_floatbar_button_onclick_minimize(xfFloatbar* floatbar) { - xfContext* xfc; + xfContext* xfc = NULL; if (!floatbar || !floatbar->xfc) return FALSE; @@ -146,7 +146,7 @@ BOOL xf_floatbar_set_root_y(xfFloatbar* floatbar, int y) BOOL xf_floatbar_hide_and_show(xfFloatbar* floatbar) { - xfContext* xfc; + xfContext* xfc = NULL; if (!floatbar || !floatbar->xfc) return FALSE; @@ -178,8 +178,8 @@ BOOL xf_floatbar_hide_and_show(xfFloatbar* floatbar) static BOOL create_floatbar(xfFloatbar* floatbar) { - xfContext* xfc; - Status status; + xfContext* xfc = NULL; + Status status = 0; XWindowAttributes attr = { 0 }; WINPR_ASSERT(floatbar); @@ -222,10 +222,10 @@ static BOOL create_floatbar(xfFloatbar* floatbar) BOOL xf_floatbar_toggle_fullscreen(xfFloatbar* floatbar, bool fullscreen) { - int i; - int size; + int i = 0; + int size = 0; bool visible = False; - xfContext* xfc; + xfContext* xfc = NULL; if (!floatbar || !floatbar->xfc) return FALSE; @@ -273,7 +273,7 @@ BOOL xf_floatbar_toggle_fullscreen(xfFloatbar* floatbar, bool fullscreen) xfFloatbarButton* xf_floatbar_new_button(xfFloatbar* floatbar, int type) { - xfFloatbarButton* button; + xfFloatbarButton* button = NULL; WINPR_ASSERT(floatbar); WINPR_ASSERT(floatbar->xfc); @@ -352,9 +352,9 @@ xfFloatbar* xf_floatbar_new(xfContext* xfc, Window window, const char* name, DWO floatbar->xfc = xfc; floatbar->locked = flags & 0x0002; xf_floatbar_toggle_fullscreen(floatbar, FALSE); - char** missingList; - int missingCount; - char* defString; + char** missingList = NULL; + int missingCount = 0; + char* defString = NULL; floatbar->fontSet = XCreateFontSet(floatbar->xfc->display, "-*-*-*-*-*-*-*-*-*-*-*-*-*-*", &missingList, &missingCount, &defString); if (floatbar->fontSet == NULL) @@ -389,12 +389,12 @@ static unsigned long xf_floatbar_get_color(xfFloatbar* floatbar, char* rgb_value static void xf_floatbar_event_expose(xfFloatbar* floatbar) { - GC gc; - GC shape_gc; - Pixmap pmap; + GC gc = NULL; + GC shape_gc = NULL; + Pixmap pmap = 0; XPoint shape[5] = { 0 }; XPoint border[5] = { 0 }; - int len; + int len = 0; WINPR_ASSERT(floatbar); WINPR_ASSERT(floatbar->xfc); @@ -477,7 +477,7 @@ static xfFloatbarButton* xf_floatbar_get_button(xfFloatbar* floatbar, Window win static void xf_floatbar_button_update_positon(xfFloatbar* floatbar) { - xfFloatbarButton* button; + xfFloatbarButton* button = NULL; WINPR_ASSERT(floatbar); xfContext* xfc = floatbar->xfc; const size_t size = ARRAYSIZE(floatbar->buttons); @@ -518,8 +518,8 @@ static void xf_floatbar_button_event_expose(xfFloatbar* floatbar, Window window) { xfFloatbarButton* button = xf_floatbar_get_button(floatbar, window); static unsigned char* bits; - GC gc; - Pixmap pattern; + GC gc = NULL; + Pixmap pattern = 0; xfContext* xfc = floatbar->xfc; if (!button) @@ -586,7 +586,7 @@ static void xf_floatbar_button_event_buttonpress(xfFloatbar* floatbar, const XBu static void xf_floatbar_button_event_buttonrelease(xfFloatbar* floatbar, const XButtonEvent* event) { - xfFloatbarButton* button; + xfFloatbarButton* button = NULL; WINPR_ASSERT(floatbar); WINPR_ASSERT(event); @@ -641,9 +641,9 @@ static void xf_floatbar_event_buttonrelease(xfFloatbar* floatbar, const XButtonE static void xf_floatbar_resize(xfFloatbar* floatbar, const XMotionEvent* event) { - int x; - int width; - int movement; + int x = 0; + int width = 0; + int movement = 0; WINPR_ASSERT(floatbar); WINPR_ASSERT(event); @@ -678,8 +678,8 @@ static void xf_floatbar_resize(xfFloatbar* floatbar, const XMotionEvent* event) static void xf_floatbar_dragging(xfFloatbar* floatbar, const XMotionEvent* event) { - int x; - int movement; + int x = 0; + int movement = 0; WINPR_ASSERT(floatbar); WINPR_ASSERT(event); @@ -705,8 +705,8 @@ static void xf_floatbar_dragging(xfFloatbar* floatbar, const XMotionEvent* event static void xf_floatbar_event_motionnotify(xfFloatbar* floatbar, const XMotionEvent* event) { - int mode; - Cursor cursor; + int mode = 0; + Cursor cursor = 0; WINPR_ASSERT(floatbar); WINPR_ASSERT(event); @@ -739,7 +739,7 @@ static void xf_floatbar_event_motionnotify(xfFloatbar* floatbar, const XMotionEv static void xf_floatbar_button_event_focusin(xfFloatbar* floatbar, const XAnyEvent* event) { - xfFloatbarButton* button; + xfFloatbarButton* button = NULL; WINPR_ASSERT(floatbar); WINPR_ASSERT(event); @@ -755,7 +755,7 @@ static void xf_floatbar_button_event_focusin(xfFloatbar* floatbar, const XAnyEve static void xf_floatbar_button_event_focusout(xfFloatbar* floatbar, const XAnyEvent* event) { - xfFloatbarButton* button; + xfFloatbarButton* button = NULL; WINPR_ASSERT(floatbar); WINPR_ASSERT(event); @@ -898,9 +898,9 @@ static void xf_floatbar_button_free(xfContext* xfc, xfFloatbarButton* button) void xf_floatbar_free(xfFloatbar* floatbar) { - size_t i; - size_t size; - xfContext* xfc; + size_t i = 0; + size_t size = 0; + xfContext* xfc = NULL; if (!floatbar) return; diff --git a/client/X11/xf_gfx.c b/client/X11/xf_gfx.c index 1280c3f41..a6a502bb7 100644 --- a/client/X11/xf_gfx.c +++ b/client/X11/xf_gfx.c @@ -21,6 +21,7 @@ #include +#include #include #include #include "xf_gfx.h" @@ -33,16 +34,16 @@ static UINT xf_OutputUpdate(xfContext* xfc, xfGfxSurface* surface) { UINT rc = ERROR_INTERNAL_ERROR; - UINT32 surfaceX; - UINT32 surfaceY; + UINT32 surfaceX = 0; + UINT32 surfaceY = 0; RECTANGLE_16 surfaceRect; - rdpGdi* gdi; - const rdpSettings* settings; - UINT32 nbRects; - UINT32 x; - double sx; - double sy; - const RECTANGLE_16* rects; + rdpGdi* gdi = NULL; + const rdpSettings* settings = NULL; + UINT32 nbRects = 0; + UINT32 x = 0; + double sx = NAN; + double sy = NAN; + const RECTANGLE_16* rects = NULL; WINPR_ASSERT(xfc); WINPR_ASSERT(surface); @@ -132,12 +133,12 @@ static UINT xf_WindowUpdate(RdpgfxClientContext* context, xfGfxSurface* surface) static UINT xf_UpdateSurfaces(RdpgfxClientContext* context) { - UINT16 count; - UINT32 index; + UINT16 count = 0; + UINT32 index = 0; UINT status = CHANNEL_RC_OK; UINT16* pSurfaceIds = NULL; rdpGdi* gdi = (rdpGdi*)context->custom; - xfContext* xfc; + xfContext* xfc = NULL; if (!gdi) return status; @@ -179,13 +180,13 @@ static UINT xf_UpdateSurfaces(RdpgfxClientContext* context) UINT xf_OutputExpose(xfContext* xfc, UINT32 x, UINT32 y, UINT32 width, UINT32 height) { - UINT16 count; - UINT32 index; + UINT16 count = 0; + UINT32 index = 0; UINT status = ERROR_INTERNAL_ERROR; RECTANGLE_16 invalidRect = { 0 }; RECTANGLE_16 intersection = { 0 }; UINT16* pSurfaceIds = NULL; - RdpgfxClientContext* context; + RdpgfxClientContext* context = NULL; WINPR_ASSERT(xfc); WINPR_ASSERT(xfc->common.context.gdi); @@ -271,8 +272,8 @@ static UINT xf_CreateSurface(RdpgfxClientContext* context, const RDPGFX_CREATE_SURFACE_PDU* createSurface) { UINT ret = CHANNEL_RC_NO_MEMORY; - size_t size; - xfGfxSurface* surface; + size_t size = 0; + xfGfxSurface* surface = NULL; rdpGdi* gdi = (rdpGdi*)context->custom; xfContext* xfc = (xfContext*)gdi->context; surface = (xfGfxSurface*)calloc(1, sizeof(xfGfxSurface)); @@ -396,7 +397,7 @@ static UINT xf_DeleteSurface(RdpgfxClientContext* context, { rdpCodecs* codecs = NULL; xfGfxSurface* surface = NULL; - UINT status; + UINT status = 0; EnterCriticalSection(&context->mux); surface = (xfGfxSurface*)context->GetSurfaceData(context, deleteSurface->surfaceId); @@ -446,8 +447,8 @@ static UINT xf_UpdateWindowFromSurface(RdpgfxClientContext* context, gdiGfxSurfa void xf_graphics_pipeline_init(xfContext* xfc, RdpgfxClientContext* gfx) { - rdpGdi* gdi; - const rdpSettings* settings; + rdpGdi* gdi = NULL; + const rdpSettings* settings = NULL; WINPR_ASSERT(xfc); WINPR_ASSERT(gfx); @@ -469,7 +470,7 @@ void xf_graphics_pipeline_init(xfContext* xfc, RdpgfxClientContext* gfx) void xf_graphics_pipeline_uninit(xfContext* xfc, RdpgfxClientContext* gfx) { - rdpGdi* gdi; + rdpGdi* gdi = NULL; WINPR_ASSERT(xfc); diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c index 4644cc9a1..458947c60 100644 --- a/client/X11/xf_graphics.c +++ b/client/X11/xf_graphics.c @@ -154,7 +154,7 @@ static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, rdpPointer* if (xpointer->nCursors == xpointer->mCursors) { - void* tmp2; + void* tmp2 = NULL; xpointer->mCursors = (xpointer->mCursors == 0 ? 1 : xpointer->mCursors * 2); tmp2 = realloc(xpointer->cursorWidths, sizeof(UINT32) * xpointer->mCursors); @@ -271,7 +271,7 @@ static Window xf_Pointer_get_window(xfContext* xfc) BOOL xf_pointer_update_scale(xfContext* xfc) { - xfPointer* pointer; + xfPointer* pointer = NULL; WINPR_ASSERT(xfc); pointer = xfc->pointer; @@ -286,8 +286,8 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer) BOOL rc = FALSE; #ifdef WITH_XCURSOR - UINT32 CursorFormat; - size_t size; + UINT32 CursorFormat = 0; + size_t size = 0; xfContext* xfc = (xfContext*)context; xfPointer* xpointer = (xfPointer*)pointer; @@ -330,7 +330,7 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer) WLog_DBG(TAG, "%p", pointer); #ifdef WITH_XCURSOR - UINT32 i; + UINT32 i = 0; xfContext* xfc = (xfContext*)context; xfPointer* xpointer = (xfPointer*)pointer; @@ -502,7 +502,7 @@ BOOL xf_register_pointer(rdpGraphics* graphics) UINT32 xf_get_local_color_format(xfContext* xfc, BOOL aligned) { - UINT32 DstFormat; + UINT32 DstFormat = 0; BOOL invert = FALSE; if (!xfc) diff --git a/client/X11/xf_input.c b/client/X11/xf_input.c index 41b9741ef..fd751d2d0 100644 --- a/client/X11/xf_input.c +++ b/client/X11/xf_input.c @@ -193,7 +193,7 @@ static BOOL register_raw_events(xfContext* xfc, Window window) { XIEventMask mask; unsigned char mask_bytes[XIMaskLen(XI_LASTEVENT)] = { 0 }; - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(xfc); @@ -220,7 +220,7 @@ static BOOL register_device_events(xfContext* xfc, Window window) { XIEventMask mask; unsigned char mask_bytes[XIMaskLen(XI_LASTEVENT)] = { 0 }; - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(xfc); @@ -290,7 +290,7 @@ int xf_input_init(xfContext* xfc, Window window) static BOOL xf_input_is_duplicate(xfContext* xfc, const XGenericEventCookie* cookie) { - const XIDeviceEvent* event; + const XIDeviceEvent* event = NULL; WINPR_ASSERT(xfc); WINPR_ASSERT(cookie); @@ -311,7 +311,7 @@ static BOOL xf_input_is_duplicate(xfContext* xfc, const XGenericEventCookie* coo static void xf_input_save_last_event(xfContext* xfc, const XGenericEventCookie* cookie) { - const XIDeviceEvent* event; + const XIDeviceEvent* event = NULL; WINPR_ASSERT(xfc); WINPR_ASSERT(cookie); @@ -330,11 +330,11 @@ static void xf_input_detect_pan(xfContext* xfc) { double dx[2]; double dy[2]; - double px; - double py; - double dist_x; - double dist_y; - rdpContext* ctx; + double px = NAN; + double py = NAN; + double dist_x = NAN; + double dist_y = NAN; + rdpContext* ctx = NULL; WINPR_ASSERT(xfc); ctx = &xfc->common.context; @@ -419,10 +419,10 @@ static void xf_input_detect_pan(xfContext* xfc) static void xf_input_detect_pinch(xfContext* xfc) { - double dist; - double delta; + double dist = NAN; + double delta = NAN; ZoomingChangeEventArgs e; - rdpContext* ctx; + rdpContext* ctx = NULL; WINPR_ASSERT(xfc); ctx = &xfc->common.context; @@ -485,7 +485,7 @@ static void xf_input_detect_pinch(xfContext* xfc) static void xf_input_touch_begin(xfContext* xfc, const XIDeviceEvent* event) { - int i; + int i = 0; WINPR_UNUSED(xfc); for (i = 0; i < MAX_CONTACTS; i++) @@ -504,7 +504,7 @@ static void xf_input_touch_begin(xfContext* xfc, const XIDeviceEvent* event) static void xf_input_touch_update(xfContext* xfc, const XIDeviceEvent* event) { - int i; + int i = 0; WINPR_ASSERT(xfc); WINPR_ASSERT(event); @@ -527,7 +527,7 @@ static void xf_input_touch_update(xfContext* xfc, const XIDeviceEvent* event) static void xf_input_touch_end(xfContext* xfc, const XIDeviceEvent* event) { - int i; + int i = 0; WINPR_UNUSED(xfc); for (i = 0; i < MAX_CONTACTS; i++) @@ -658,9 +658,9 @@ static void xf_input_show_cursor(xfContext* xfc) static int xf_input_touch_remote(xfContext* xfc, XIDeviceEvent* event, int evtype) { - int x; - int y; - int touchId; + int x = 0; + int y = 0; + int touchId = 0; RdpeiClientContext* rdpei = xfc->common.rdpei; if (!rdpei) @@ -692,8 +692,8 @@ static int xf_input_touch_remote(xfContext* xfc, XIDeviceEvent* event, int evtyp static BOOL xf_input_pen_remote(xfContext* xfc, XIDeviceEvent* event, int evtype, int deviceid) { - int x; - int y; + int x = 0; + int y = 0; RdpeiClientContext* rdpei = xfc->common.rdpei; if (!rdpei) @@ -765,7 +765,7 @@ static int xf_input_pens_unhover(xfContext* xfc) int xf_input_event(xfContext* xfc, const XEvent* xevent, XIDeviceEvent* event, int evtype) { - const rdpSettings* settings; + const rdpSettings* settings = NULL; WINPR_ASSERT(xfc); WINPR_ASSERT(xevent); @@ -927,7 +927,7 @@ int xf_input_init(xfContext* xfc, Window window) int xf_input_handle_event(xfContext* xfc, const XEvent* event) { #ifdef WITH_XI - const rdpSettings* settings; + const rdpSettings* settings = NULL; WINPR_ASSERT(xfc); settings = xfc->common.context.settings; diff --git a/client/X11/xf_keyboard.c b/client/X11/xf_keyboard.c index bcf6bf8c2..c5e913382 100644 --- a/client/X11/xf_keyboard.c +++ b/client/X11/xf_keyboard.c @@ -80,13 +80,13 @@ static void xf_keyboard_clear(xfContext* xfc) static BOOL xf_keyboard_action_script_init(xfContext* xfc) { - wObject* obj; - FILE* keyScript; - char* keyCombination; + wObject* obj = NULL; + FILE* keyScript = NULL; + char* keyCombination = NULL; char buffer[1024] = { 0 }; char command[1024] = { 0 }; - const rdpSettings* settings; - const char* ActionScript; + const rdpSettings* settings = NULL; + const char* ActionScript = NULL; WINPR_ASSERT(xfc); settings = xfc->common.context.settings; @@ -147,7 +147,7 @@ static void xf_keyboard_action_script_free(xfContext* xfc) BOOL xf_keyboard_init(xfContext* xfc) { - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(xfc); @@ -176,7 +176,7 @@ void xf_keyboard_free(xfContext* xfc) void xf_keyboard_key_press(xfContext* xfc, const XKeyEvent* event, KeySym keysym) { - BOOL last; + BOOL last = 0; WINPR_ASSERT(xfc); WINPR_ASSERT(event); @@ -236,8 +236,8 @@ BOOL xf_keyboard_key_pressed(xfContext* xfc, KeySym keysym) void xf_keyboard_send_key(xfContext* xfc, BOOL down, BOOL repeat, const XKeyEvent* event) { - DWORD rdp_scancode; - rdpInput* input; + DWORD rdp_scancode = 0; + rdpInput* input = NULL; WINPR_ASSERT(xfc); WINPR_ASSERT(event); @@ -276,7 +276,7 @@ void xf_keyboard_send_key(xfContext* xfc, BOOL down, BOOL repeat, const XKeyEven XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, NULL); KeySym ignore = { 0 }; - Status return_status; + Status return_status = 0; XKeyEvent ev = *event; ev.type = KeyPress; xwc = XwcLookupString(xic, &ev, buffer, ARRAYSIZE(buffer), &ignore, @@ -310,8 +310,8 @@ void xf_keyboard_send_key(xfContext* xfc, BOOL down, BOOL repeat, const XKeyEven int xf_keyboard_read_keyboard_state(xfContext* xfc) { - int dummy; - Window wdummy; + int dummy = 0; + Window wdummy = 0; UINT32 state = 0; if (!xfc->remote_app && xfc->window) diff --git a/client/X11/xf_monitor.c b/client/X11/xf_monitor.c index ec32463f5..392717c7f 100644 --- a/client/X11/xf_monitor.c +++ b/client/X11/xf_monitor.c @@ -55,10 +55,10 @@ int xf_list_monitors(xfContext* xfc) { - Display* display; - int major; - int minor; - int i; + Display* display = NULL; + int major = 0; + int minor = 0; + int i = 0; int nmonitors = 0; display = XOpenDisplay(NULL); @@ -116,8 +116,8 @@ int xf_list_monitors(xfContext* xfc) static BOOL xf_is_monitor_id_active(xfContext* xfc, UINT32 id) { - UINT32 index; - const rdpSettings* settings; + UINT32 index = 0; + const rdpSettings* settings = NULL; WINPR_ASSERT(xfc); @@ -196,7 +196,7 @@ BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight) if (vscreen->nmonitors) { - int i; + int i = 0; for (i = 0; i < vscreen->nmonitors; i++) { @@ -224,7 +224,7 @@ BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight) if (vscreen->nmonitors) { - int i; + int i = 0; for (i = 0; i < vscreen->nmonitors; i++) { @@ -246,7 +246,7 @@ BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight) /* Determine which monitor that the mouse cursor is on */ if (vscreen->monitors) { - int i; + int i = 0; for (i = 0; i < vscreen->nmonitors; i++) { @@ -397,7 +397,7 @@ BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight) } for (UINT32 i = 0; i < vscreen->nmonitors; i++) { - MONITOR_ATTRIBUTES* attrs; + MONITOR_ATTRIBUTES* attrs = NULL; if (!xf_is_monitor_id_active(xfc, (UINT32)i)) continue; @@ -434,8 +434,8 @@ BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight) if (useXRandr && rrmonitors) { - Rotation rot; - Rotation ret; + Rotation rot = 0; + Rotation ret = 0; attrs = &monitor->attributes; attrs->physicalWidth = rrmonitors[i].mwidth; attrs->physicalHeight = rrmonitors[i].mheight; @@ -463,8 +463,8 @@ BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight) * to go fullscreen on the current monitor only */ if (nmonitors == 0 && vscreen->nmonitors > 0) { - INT32 width; - INT32 height; + INT32 width = 0; + INT32 height = 0; if (!vscreen->monitors) goto fail; diff --git a/client/X11/xf_rail.c b/client/X11/xf_rail.c index 76400c754..853b3a536 100644 --- a/client/X11/xf_rail.c +++ b/client/X11/xf_rail.c @@ -155,14 +155,14 @@ void xf_rail_adjust_position(xfContext* xfc, xfAppWindow* appWindow) void xf_rail_end_local_move(xfContext* xfc, xfAppWindow* appWindow) { - int x; - int y; - int child_x; - int child_y; - unsigned int mask; - Window root_window; - Window child_window; - rdpInput* input; + int x = 0; + int y = 0; + int child_x = 0; + int child_y = 0; + unsigned int mask = 0; + Window root_window = 0; + Window child_window = 0; + rdpInput* input = NULL; WINPR_ASSERT(xfc); @@ -568,7 +568,7 @@ static BOOL xf_rail_window_delete(rdpContext* context, const WINDOW_ORDER_INFO* static xfRailIconCache* RailIconCache_New(rdpSettings* settings) { - xfRailIconCache* cache; + xfRailIconCache* cache = NULL; cache = calloc(1, sizeof(xfRailIconCache)); if (!cache) @@ -592,7 +592,7 @@ static xfRailIconCache* RailIconCache_New(rdpSettings* settings) static void RailIconCache_Free(xfRailIconCache* cache) { - UINT32 i; + UINT32 i = 0; if (cache) { @@ -643,10 +643,10 @@ static xfRailIcon* RailIconCache_Lookup(xfRailIconCache* cache, UINT8 cacheId, U static BOOL convert_rail_icon(const ICON_INFO* iconInfo, xfRailIcon* railIcon) { BYTE* argbPixels = NULL; - BYTE* nextPixel; - long* pixels; - int i; - int nelements; + BYTE* nextPixel = NULL; + long* pixels = NULL; + int i = 0; + int nelements = 0; argbPixels = calloc(1ull * iconInfo->width * iconInfo->height, 4); if (!argbPixels) @@ -698,9 +698,9 @@ static BOOL xf_rail_window_icon(rdpContext* context, const WINDOW_ORDER_INFO* or const WINDOW_ICON_ORDER* windowIcon) { xfContext* xfc = (xfContext*)context; - xfAppWindow* railWindow; - xfRailIcon* icon; - BOOL replaceIcon; + xfAppWindow* railWindow = NULL; + xfRailIcon* icon = NULL; + BOOL replaceIcon = 0; railWindow = xf_rail_get_window(xfc, orderInfo->windowId); if (!railWindow) @@ -731,9 +731,9 @@ static BOOL xf_rail_window_cached_icon(rdpContext* context, const WINDOW_ORDER_I const WINDOW_CACHED_ICON_ORDER* windowCachedIcon) { xfContext* xfc = (xfContext*)context; - xfAppWindow* railWindow; - xfRailIcon* icon; - BOOL replaceIcon; + xfAppWindow* railWindow = NULL; + xfRailIcon* icon = NULL; + BOOL replaceIcon = 0; railWindow = xf_rail_get_window(xfc, orderInfo->windowId); if (!railWindow) @@ -839,7 +839,7 @@ static void xf_rail_register_update_callbacks(rdpUpdate* update) static UINT xf_rail_server_execute_result(RailClientContext* context, const RAIL_EXEC_RESULT_ORDER* execResult) { - xfContext* xfc; + xfContext* xfc = NULL; WINPR_ASSERT(context); WINPR_ASSERT(execResult); @@ -906,7 +906,7 @@ static UINT xf_rail_server_local_move_size(RailClientContext* context, int x = 0; int y = 0; int direction = 0; - Window child_window; + Window child_window = 0; xfContext* xfc = (xfContext*)context->custom; xfAppWindow* appWindow = xf_rail_get_window(xfc, localMoveSize->windowId); @@ -1136,7 +1136,7 @@ int xf_rail_uninit(xfContext* xfc, RailClientContext* rail) xfAppWindow* xf_rail_add_window(xfContext* xfc, UINT64 id, UINT32 x, UINT32 y, UINT32 width, UINT32 height, UINT32 surfaceId) { - xfAppWindow* appWindow; + xfAppWindow* appWindow = NULL; if (!xfc) return NULL; diff --git a/client/X11/xf_tsmf.c b/client/X11/xf_tsmf.c index e198e8de7..01154a0f0 100644 --- a/client/X11/xf_tsmf.c +++ b/client/X11/xf_tsmf.c @@ -56,7 +56,7 @@ typedef struct xf_xv_context xfXvContext; static BOOL xf_tsmf_is_format_supported(xfXvContext* xv, UINT32 pixfmt) { - int i; + int i = 0; if (!xv->xv_pixfmts) return FALSE; @@ -72,20 +72,20 @@ static BOOL xf_tsmf_is_format_supported(xfXvContext* xv, UINT32 pixfmt) static int xf_tsmf_xv_video_frame_event(TsmfClientContext* tsmf, TSMF_VIDEO_FRAME_EVENT* event) { - int i; - int x; - int y; - UINT32 width; - UINT32 height; - BYTE* data1; - BYTE* data2; - UINT32 pixfmt; - UINT32 xvpixfmt; - XvImage* image; + int i = 0; + int x = 0; + int y = 0; + UINT32 width = 0; + UINT32 height = 0; + BYTE* data1 = NULL; + BYTE* data2 = NULL; + UINT32 pixfmt = 0; + UINT32 xvpixfmt = 0; + XvImage* image = NULL; int colorkey = 0; int numRects = 0; - xfContext* xfc; - xfXvContext* xv; + xfContext* xfc = NULL; + xfXvContext* xv = NULL; XRectangle* xrects = NULL; XShmSegmentInfo shminfo; BOOL converti420yv12 = FALSE; @@ -308,18 +308,18 @@ static int xf_tsmf_xv_video_frame_event(TsmfClientContext* tsmf, TSMF_VIDEO_FRAM static int xf_tsmf_xv_init(xfContext* xfc, TsmfClientContext* tsmf) { - int ret; - unsigned int i; - unsigned int version; - unsigned int release; - unsigned int event_base; - unsigned int error_base; - unsigned int request_base; - unsigned int num_adaptors; - xfXvContext* xv; - XvAdaptorInfo* ai; - XvAttribute* attr; - XvImageFormatValues* fo; + int ret = 0; + unsigned int i = 0; + unsigned int version = 0; + unsigned int release = 0; + unsigned int event_base = 0; + unsigned int error_base = 0; + unsigned int request_base = 0; + unsigned int num_adaptors = 0; + xfXvContext* xv = NULL; + XvAdaptorInfo* ai = NULL; + XvAttribute* attr = NULL; + XvImageFormatValues* fo = NULL; if (xfc->xv_context) return 1; /* context already created */ diff --git a/client/X11/xf_video.c b/client/X11/xf_video.c index aa244bc8d..461f33d4e 100644 --- a/client/X11/xf_video.c +++ b/client/X11/xf_video.c @@ -36,8 +36,8 @@ typedef struct static VideoSurface* xfVideoCreateSurface(VideoClientContext* video, UINT32 x, UINT32 y, UINT32 width, UINT32 height) { - xfContext* xfc; - xfVideoSurface* ret; + xfContext* xfc = NULL; + xfVideoSurface* ret = NULL; WINPR_ASSERT(video); ret = (xfVideoSurface*)VideoClient_CreateCommonContext(sizeof(xfContext), x, y, width, height); @@ -64,8 +64,8 @@ static BOOL xfVideoShowSurface(VideoClientContext* video, const VideoSurface* su UINT32 destinationWidth, UINT32 destinationHeight) { const xfVideoSurface* xfSurface = (const xfVideoSurface*)surface; - xfContext* xfc; - const rdpSettings* settings; + xfContext* xfc = NULL; + const rdpSettings* settings = NULL; WINPR_ASSERT(video); WINPR_ASSERT(xfSurface); diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c index 187dda8b5..dd51a0fd1 100644 --- a/client/X11/xf_window.c +++ b/client/X11/xf_window.c @@ -128,7 +128,7 @@ static void xf_SetWindowTitleText(xfContext* xfc, Window window, const char* nam void xf_SendClientEvent(xfContext* xfc, Window window, Atom atom, unsigned int numArgs, ...) { XEvent xevent = { 0 }; - unsigned int i; + unsigned int i = 0; va_list argp; va_start(argp, numArgs); @@ -159,10 +159,10 @@ void xf_SetWindowMinimized(xfContext* xfc, xfWindow* window) void xf_SetWindowFullscreen(xfContext* xfc, xfWindow* window, BOOL fullscreen) { - UINT32 i; - const rdpSettings* settings; - int startX; - int startY; + UINT32 i = 0; + const rdpSettings* settings = NULL; + int startX = 0; + int startY = 0; UINT32 width = window->width; UINT32 height = window->height; @@ -290,10 +290,10 @@ void xf_SetWindowFullscreen(xfContext* xfc, xfWindow* window, BOOL fullscreen) /* if window is in maximized state, save and remove */ if (xfc->_NET_WM_STATE_MAXIMIZED_VERT != None) { - BYTE state; - unsigned long nitems; - unsigned long bytes; - BYTE* prop; + BYTE state = 0; + unsigned long nitems = 0; + unsigned long bytes = 0; + BYTE* prop = NULL; if (xf_GetWindowProperty(xfc, window->handle, xfc->_NET_WM_STATE, 255, &nitems, &bytes, &prop)) @@ -390,10 +390,10 @@ BOOL xf_GetWindowProperty(xfContext* xfc, Window window, Atom property, int leng BOOL xf_GetCurrentDesktop(xfContext* xfc) { - BOOL status; - unsigned long nitems; - unsigned long bytes; - unsigned char* prop; + BOOL status = 0; + unsigned long nitems = 0; + unsigned long bytes = 0; + unsigned char* prop = NULL; status = xf_GetWindowProperty(xfc, DefaultRootWindow(xfc->display), xfc->_NET_CURRENT_DESKTOP, 1, &nitems, &bytes, &prop); @@ -407,11 +407,11 @@ BOOL xf_GetCurrentDesktop(xfContext* xfc) BOOL xf_GetWorkArea(xfContext* xfc) { - long* plong; - BOOL status; - unsigned long nitems; - unsigned long bytes; - unsigned char* prop; + long* plong = NULL; + BOOL status = 0; + unsigned long nitems = 0; + unsigned long bytes = 0; + unsigned char* prop = NULL; status = xf_GetCurrentDesktop(xfc); if (!status) @@ -460,7 +460,7 @@ void xf_SetWindowUnlisted(xfContext* xfc, Window window) static void xf_SetWindowPID(xfContext* xfc, Window window, pid_t pid) { - Atom am_wm_pid; + Atom am_wm_pid = 0; WINPR_ASSERT(xfc); if (!pid) @@ -627,7 +627,7 @@ xfWindow* xf_CreateDesktopWindow(xfContext* xfc, char* name, int width, int heig void xf_ResizeDesktopWindow(xfContext* xfc, xfWindow* window, int width, int height) { - XSizeHints* size_hints; + XSizeHints* size_hints = NULL; rdpSettings* settings = NULL; if (!xfc || !window) @@ -696,7 +696,7 @@ void xf_DestroyDesktopWindow(xfContext* xfc, xfWindow* window) void xf_SetWindowStyle(xfContext* xfc, xfAppWindow* appWindow, UINT32 style, UINT32 ex_style) { - Atom window_type; + Atom window_type = 0; BOOL redirect = FALSE; if ((ex_style & WS_EX_NOACTIVATE) || (ex_style & WS_EX_TOOLWINDOW)) @@ -752,8 +752,8 @@ void xf_SetWindowText(xfContext* xfc, xfAppWindow* appWindow, const char* name) static void xf_FixWindowCoordinates(xfContext* xfc, int* x, int* y, int* width, int* height) { - int vscreen_width; - int vscreen_height; + int vscreen_width = 0; + int vscreen_height = 0; vscreen_width = xfc->vscreen.area.right - xfc->vscreen.area.left + 1; vscreen_height = xfc->vscreen.area.bottom - xfc->vscreen.area.top + 1; @@ -810,10 +810,10 @@ int xf_AppWindowInit(xfContext* xfc, xfAppWindow* appWindow) BOOL xf_AppWindowCreate(xfContext* xfc, xfAppWindow* appWindow) { XGCValues gcv = { 0 }; - int input_mask; - XWMHints* InputModeHint; - XClassHint* class_hints; - const rdpSettings* settings; + int input_mask = 0; + XWMHints* InputModeHint = NULL; + XClassHint* class_hints = NULL; + const rdpSettings* settings = NULL; WINPR_ASSERT(xfc); WINPR_ASSERT(appWindow); @@ -895,7 +895,7 @@ void xf_SetWindowMinMaxInfo(xfContext* xfc, xfAppWindow* appWindow, int maxWidth int maxPosX, int maxPosY, int minTrackWidth, int minTrackHeight, int maxTrackWidth, int maxTrackHeight) { - XSizeHints* size_hints; + XSizeHints* size_hints = NULL; size_hints = XAllocSizeHints(); if (size_hints) @@ -1061,8 +1061,8 @@ void xf_ShowWindow(xfContext* xfc, xfAppWindow* appWindow, BYTE state) void xf_SetWindowRects(xfContext* xfc, xfAppWindow* appWindow, RECTANGLE_16* rects, int nrects) { - int i; - XRectangle* xrects; + int i = 0; + XRectangle* xrects = NULL; if (nrects < 1) return; @@ -1087,8 +1087,8 @@ void xf_SetWindowRects(xfContext* xfc, xfAppWindow* appWindow, RECTANGLE_16* rec void xf_SetWindowVisibilityRects(xfContext* xfc, xfAppWindow* appWindow, UINT32 rectsOffsetX, UINT32 rectsOffsetY, RECTANGLE_16* rects, int nrects) { - int i; - XRectangle* xrects; + int i = 0; + XRectangle* xrects = NULL; if (nrects < 1) return; @@ -1113,9 +1113,9 @@ void xf_SetWindowVisibilityRects(xfContext* xfc, xfAppWindow* appWindow, UINT32 void xf_UpdateWindowArea(xfContext* xfc, xfAppWindow* appWindow, int x, int y, int width, int height) { - int ax; - int ay; - const rdpSettings* settings; + int ax = 0; + int ay = 0; + const rdpSettings* settings = NULL; WINPR_ASSERT(xfc); @@ -1201,8 +1201,8 @@ void xf_DestroyWindow(xfContext* xfc, xfAppWindow* appWindow) xfAppWindow* xf_AppWindowFromX11Window(xfContext* xfc, Window wnd) { - size_t index; - size_t count; + size_t index = 0; + size_t count = 0; ULONG_PTR* pKeys = NULL; WINPR_ASSERT(xfc); diff --git a/client/common/client.c b/client/common/client.c index 06be04a56..fd7722586 100644 --- a/client/common/client.c +++ b/client/common/client.c @@ -81,7 +81,7 @@ static void set_default_callbacks(freerdp* instance) static BOOL freerdp_client_common_new(freerdp* instance, rdpContext* context) { - RDP_CLIENT_ENTRY_POINTS* pEntryPoints; + RDP_CLIENT_ENTRY_POINTS* pEntryPoints = NULL; WINPR_ASSERT(instance); WINPR_ASSERT(context); @@ -96,7 +96,7 @@ static BOOL freerdp_client_common_new(freerdp* instance, rdpContext* context) static void freerdp_client_common_free(freerdp* instance, rdpContext* context) { - RDP_CLIENT_ENTRY_POINTS* pEntryPoints; + RDP_CLIENT_ENTRY_POINTS* pEntryPoints = NULL; WINPR_ASSERT(instance); WINPR_ASSERT(context); @@ -110,8 +110,8 @@ static void freerdp_client_common_free(freerdp* instance, rdpContext* context) rdpContext* freerdp_client_context_new(const RDP_CLIENT_ENTRY_POINTS* pEntryPoints) { - freerdp* instance; - rdpContext* context; + freerdp* instance = NULL; + rdpContext* context = NULL; if (!pEntryPoints) return NULL; @@ -154,7 +154,7 @@ out_fail: void freerdp_client_context_free(rdpContext* context) { - freerdp* instance; + freerdp* instance = NULL; if (!context) return; @@ -176,7 +176,7 @@ void freerdp_client_context_free(rdpContext* context) int freerdp_client_start(rdpContext* context) { - RDP_CLIENT_ENTRY_POINTS* pEntryPoints; + RDP_CLIENT_ENTRY_POINTS* pEntryPoints = NULL; if (!context || !context->instance || !context->instance->pClientEntryPoints) return ERROR_BAD_ARGUMENTS; @@ -190,7 +190,7 @@ int freerdp_client_start(rdpContext* context) int freerdp_client_stop(rdpContext* context) { - RDP_CLIENT_ENTRY_POINTS* pEntryPoints; + RDP_CLIENT_ENTRY_POINTS* pEntryPoints = NULL; if (!context || !context->instance || !context->instance->pClientEntryPoints) return ERROR_BAD_ARGUMENTS; @@ -276,7 +276,7 @@ out_error: int freerdp_client_settings_parse_command_line(rdpSettings* settings, int argc, char** argv, BOOL allowUnknown) { - int status; + int status = 0; if (argc < 1) return 0; @@ -301,7 +301,7 @@ int freerdp_client_settings_parse_command_line(rdpSettings* settings, int argc, int freerdp_client_settings_parse_connection_file(rdpSettings* settings, const char* filename) { - rdpFile* file; + rdpFile* file = NULL; int ret = -1; file = freerdp_client_rdp_file_new(); @@ -323,7 +323,7 @@ out: int freerdp_client_settings_parse_connection_file_buffer(rdpSettings* settings, const BYTE* buffer, size_t size) { - rdpFile* file; + rdpFile* file = NULL; int status = -1; file = freerdp_client_rdp_file_new(); @@ -343,7 +343,7 @@ int freerdp_client_settings_parse_connection_file_buffer(rdpSettings* settings, int freerdp_client_settings_write_connection_file(const rdpSettings* settings, const char* filename, BOOL unicode) { - rdpFile* file; + rdpFile* file = NULL; int ret = -1; file = freerdp_client_rdp_file_new(); @@ -364,12 +364,12 @@ out: int freerdp_client_settings_parse_assistance_file(rdpSettings* settings, int argc, char* argv[]) { - int status; - int x; + int status = 0; + int x = 0; int ret = -1; - char* filename; + char* filename = NULL; char* password = NULL; - rdpAssistanceFile* file; + rdpAssistanceFile* file = NULL; if (!settings || !argv || (argc < 2)) return -1; @@ -423,7 +423,7 @@ static BOOL client_cli_authenticate_raw(freerdp* instance, rdp_auth_reason reaso const char* auth[] = { "Username: ", "Domain: ", "Password: " }; const char* authPin[] = { "Username: ", "Domain: ", "Smartcard-Pin: " }; const char* gw[] = { "GatewayUsername: ", "GatewayDomain: ", "GatewayPassword: " }; - const char** prompt; + const char** prompt = NULL; BOOL pinOnly = FALSE; WINPR_ASSERT(instance); @@ -553,7 +553,7 @@ BOOL client_cli_authenticate_ex(freerdp* instance, char** username, char** passw BOOL client_cli_choose_smartcard(freerdp* instance, SmartcardCertInfo** cert_list, DWORD count, DWORD* choice, BOOL gateway) { - unsigned long answer; + unsigned long answer = 0; char* p = NULL; printf("Multiple smartcards are available for use:\n"); @@ -614,7 +614,7 @@ BOOL client_cli_gw_authenticate(freerdp* instance, char** username, char** passw static DWORD client_cli_accept_certificate(freerdp* instance) { - int answer; + int answer = 0; WINPR_ASSERT(instance); WINPR_ASSERT(instance->context); @@ -894,7 +894,7 @@ BOOL client_cli_present_gateway_message(freerdp* instance, UINT32 type, BOOL isD BOOL isConsentMandatory, size_t length, const WCHAR* message) { - int answer; + int answer = 0; const char* msgType = (type == GATEWAY_MESSAGE_CONSENT) ? "Consent message" : "Service message"; WINPR_ASSERT(instance); @@ -1210,9 +1210,9 @@ BOOL client_auto_reconnect(freerdp* instance) BOOL client_auto_reconnect_ex(freerdp* instance, BOOL (*window_events)(freerdp* instance)) { BOOL retry = TRUE; - UINT32 error; + UINT32 error = 0; UINT32 numRetries = 0; - rdpSettings* settings; + rdpSettings* settings = NULL; if (!instance) return FALSE; @@ -1315,8 +1315,8 @@ int freerdp_client_common_stop(rdpContext* context) #if defined(CHANNEL_ENCOMSP_CLIENT) BOOL freerdp_client_encomsp_toggle_control(EncomspClientContext* encomsp) { - rdpClientContext* cctx; - BOOL state; + rdpClientContext* cctx = NULL; + BOOL state = 0; if (!encomsp) return FALSE; @@ -1350,9 +1350,9 @@ static UINT client_encomsp_participant_created(EncomspClientContext* context, const ENCOMSP_PARTICIPANT_CREATED_PDU* participantCreated) { - rdpClientContext* cctx; - rdpSettings* settings; - BOOL request; + rdpClientContext* cctx = NULL; + rdpSettings* settings = NULL; + BOOL request = 0; if (!context || !context->custom || !participantCreated) return ERROR_INVALID_PARAMETER; @@ -1513,7 +1513,7 @@ BOOL freerdp_client_send_wheel_event(rdpClientContext* cctx, UINT16 mflags) #if defined(CHANNEL_AINPUT_CLIENT) if (cctx->ainput) { - UINT rc; + UINT rc = 0; UINT64 flags = 0; INT32 x = 0; INT32 y = 0; @@ -1554,7 +1554,7 @@ BOOL freerdp_client_send_wheel_event(rdpClientContext* cctx, UINT16 mflags) #if defined(CHANNEL_AINPUT_CLIENT) static INLINE BOOL ainput_send_diff_event(rdpClientContext* cctx, UINT64 flags, INT32 x, INT32 y) { - UINT rc; + UINT rc = 0; WINPR_ASSERT(cctx); WINPR_ASSERT(cctx->ainput); @@ -1691,7 +1691,7 @@ static BOOL freerdp_handle_touch_up(rdpClientContext* cctx, const FreeRDP_TouchC } else { - int contactId; + int contactId = 0; if (rdpei->TouchRawEvent) { @@ -1743,7 +1743,7 @@ static BOOL freerdp_handle_touch_down(rdpClientContext* cctx, const FreeRDP_Touc } else { - int contactId; + int contactId = 0; if (rdpei->TouchRawEvent) { @@ -1788,7 +1788,7 @@ static BOOL freerdp_handle_touch_motion(rdpClientContext* cctx, const FreeRDP_To } else { - int contactId; + int contactId = 0; if (rdpei->TouchRawEvent) { diff --git a/client/common/client_cliprdr_file.c b/client/common/client_cliprdr_file.c index 9314b1ba6..cc71aaecd 100644 --- a/client/common/client_cliprdr_file.c +++ b/client/common/client_cliprdr_file.c @@ -211,7 +211,7 @@ static void fuse_file_free(void* data) static CliprdrFuseFile* fuse_file_new(void) { - CliprdrFuseFile* fuse_file; + CliprdrFuseFile* fuse_file = NULL; fuse_file = calloc(1, sizeof(CliprdrFuseFile)); if (!fuse_file) @@ -267,7 +267,7 @@ static BOOL does_server_support_clipdata_locking(CliprdrFileContext* file_contex static UINT32 get_next_free_clip_data_id(CliprdrFileContext* file_context) { - UINT32 clip_data_id; + UINT32 clip_data_id = 0; WINPR_ASSERT(file_context); @@ -286,7 +286,7 @@ static UINT32 get_next_free_clip_data_id(CliprdrFileContext* file_context) static CliprdrFuseClipDataEntry* clip_data_entry_new(CliprdrFileContext* file_context, BOOL needs_clip_data_id) { - CliprdrFuseClipDataEntry* clip_data_entry; + CliprdrFuseClipDataEntry* clip_data_entry = NULL; CLIPRDR_LOCK_CLIPBOARD_DATA lock_clipboard_data = { 0 }; WINPR_ASSERT(file_context); @@ -422,7 +422,7 @@ static void clear_selection(CliprdrFileContext* file_context, BOOL all_selection CliprdrFuseClipDataEntry* clip_data_entry) { FuseFileClearContext clear_context = { 0 }; - CliprdrFuseFile* root_dir; + CliprdrFuseFile* root_dir = NULL; CliprdrFuseFile* clip_data_dir = NULL; WINPR_ASSERT(file_context); @@ -538,7 +538,7 @@ static void clear_cdi_entries(CliprdrFileContext* file_context) static UINT prepare_clip_data_entry_with_id(CliprdrFileContext* file_context) { - CliprdrFuseClipDataEntry* clip_data_entry; + CliprdrFuseClipDataEntry* clip_data_entry = NULL; WINPR_ASSERT(file_context); @@ -681,7 +681,7 @@ static CliprdrFuseRequest* cliprdr_fuse_request_new(CliprdrFileContext* file_con CliprdrFuseFile* fuse_file, fuse_req_t fuse_req, FuseLowlevelOperationType operation_type) { - CliprdrFuseRequest* fuse_request; + CliprdrFuseRequest* fuse_request = NULL; UINT32 stream_id = file_context->next_stream_id; WINPR_ASSERT(file_context); @@ -721,7 +721,7 @@ static CliprdrFuseRequest* cliprdr_fuse_request_new(CliprdrFileContext* file_con static BOOL request_file_size_async(CliprdrFileContext* file_context, CliprdrFuseFile* fuse_file, fuse_req_t fuse_req, FuseLowlevelOperationType operation_type) { - CliprdrFuseRequest* fuse_request; + CliprdrFuseRequest* fuse_request = NULL; CLIPRDR_FILE_CONTENTS_REQUEST file_contents_request = { 0 }; WINPR_ASSERT(file_context); @@ -783,8 +783,8 @@ static void write_file_attributes(CliprdrFuseFile* fuse_file, struct stat* attr) static void cliprdr_file_fuse_lookup(fuse_req_t fuse_req, fuse_ino_t parent_ino, const char* name) { CliprdrFileContext* file_context = fuse_req_userdata(fuse_req); - CliprdrFuseFile* parent; - CliprdrFuseFile* fuse_file; + CliprdrFuseFile* parent = NULL; + CliprdrFuseFile* fuse_file = NULL; struct fuse_entry_param entry = { 0 }; WINPR_ASSERT(file_context); @@ -809,7 +809,7 @@ static void cliprdr_file_fuse_lookup(fuse_req_t fuse_req, fuse_ino_t parent_ino, if (!fuse_file->is_directory && !fuse_file->has_size) { - BOOL result; + BOOL result = 0; result = request_file_size_async(file_context, fuse_file, fuse_req, FUSE_LL_OPERATION_LOOKUP); @@ -834,7 +834,7 @@ static void cliprdr_file_fuse_getattr(fuse_req_t fuse_req, fuse_ino_t fuse_ino, struct fuse_file_info* file_info) { CliprdrFileContext* file_context = fuse_req_userdata(fuse_req); - CliprdrFuseFile* fuse_file; + CliprdrFuseFile* fuse_file = NULL; struct stat attr = { 0 }; WINPR_ASSERT(file_context); @@ -852,7 +852,7 @@ static void cliprdr_file_fuse_getattr(fuse_req_t fuse_req, fuse_ino_t fuse_ino, if (!fuse_file->is_directory && !fuse_file->has_size) { - BOOL result; + BOOL result = 0; result = request_file_size_async(file_context, fuse_file, fuse_req, FUSE_LL_OPERATION_GETATTR); @@ -874,7 +874,7 @@ static void cliprdr_file_fuse_open(fuse_req_t fuse_req, fuse_ino_t fuse_ino, struct fuse_file_info* file_info) { CliprdrFileContext* file_context = fuse_req_userdata(fuse_req); - CliprdrFuseFile* fuse_file; + CliprdrFuseFile* fuse_file = NULL; WINPR_ASSERT(file_context); @@ -908,7 +908,7 @@ static void cliprdr_file_fuse_open(fuse_req_t fuse_req, fuse_ino_t fuse_ino, static BOOL request_file_range_async(CliprdrFileContext* file_context, CliprdrFuseFile* fuse_file, fuse_req_t fuse_req, off_t offset, size_t requested_size) { - CliprdrFuseRequest* fuse_request; + CliprdrFuseRequest* fuse_request = NULL; CLIPRDR_FILE_CONTENTS_REQUEST file_contents_request = { 0 }; WINPR_ASSERT(file_context); @@ -951,8 +951,8 @@ static void cliprdr_file_fuse_read(fuse_req_t fuse_req, fuse_ino_t fuse_ino, siz off_t offset, struct fuse_file_info* file_info) { CliprdrFileContext* file_context = fuse_req_userdata(fuse_req); - CliprdrFuseFile* fuse_file; - BOOL result; + CliprdrFuseFile* fuse_file = NULL; + BOOL result = 0; WINPR_ASSERT(file_context); @@ -989,7 +989,7 @@ static void cliprdr_file_fuse_opendir(fuse_req_t fuse_req, fuse_ino_t fuse_ino, struct fuse_file_info* file_info) { CliprdrFileContext* file_context = fuse_req_userdata(fuse_req); - CliprdrFuseFile* fuse_file; + CliprdrFuseFile* fuse_file = NULL; WINPR_ASSERT(file_context); @@ -1021,15 +1021,15 @@ static void cliprdr_file_fuse_readdir(fuse_req_t fuse_req, fuse_ino_t fuse_ino, off_t offset, struct fuse_file_info* file_info) { CliprdrFileContext* file_context = fuse_req_userdata(fuse_req); - CliprdrFuseFile* fuse_file; - CliprdrFuseFile* child; + CliprdrFuseFile* fuse_file = NULL; + CliprdrFuseFile* child = NULL; struct stat attr = { 0 }; - size_t written_size; - size_t entry_size; - char* filename; - char* buf; - off_t i; - size_t j; + size_t written_size = 0; + size_t entry_size = 0; + char* filename = NULL; + char* buf = NULL; + off_t i = 0; + size_t j = 0; WINPR_ASSERT(file_context); @@ -1170,8 +1170,8 @@ static UINT cliprdr_file_context_server_file_contents_response( CliprdrClientContext* cliprdr_context, const CLIPRDR_FILE_CONTENTS_RESPONSE* file_contents_response) { - CliprdrFileContext* file_context; - CliprdrFuseRequest* fuse_request; + CliprdrFileContext* file_context = NULL; + CliprdrFuseRequest* fuse_request = NULL; struct fuse_entry_param entry = { 0 }; WINPR_ASSERT(cliprdr_context); @@ -1574,7 +1574,7 @@ static UINT cliprdr_file_context_server_file_contents_request( static BOOL xf_cliprdr_clipboard_is_valid_unix_filename(LPCWSTR filename) { - LPCWSTR c; + LPCWSTR c = NULL; if (!filename) return FALSE; @@ -1686,7 +1686,7 @@ static BOOL cliprdr_file_client_content_changed_and_update(CliprdrFileContext* f #if defined(WITH_FUSE) static fuse_ino_t get_next_free_inode(CliprdrFileContext* file_context) { - fuse_ino_t ino; + fuse_ino_t ino = 0; WINPR_ASSERT(file_context); @@ -1703,9 +1703,9 @@ static fuse_ino_t get_next_free_inode(CliprdrFileContext* file_context) static CliprdrFuseFile* clip_data_dir_new(CliprdrFileContext* file_context, BOOL has_clip_data_id, UINT32 clip_data_id) { - CliprdrFuseFile* root_dir; - CliprdrFuseFile* clip_data_dir; - size_t path_length; + CliprdrFuseFile* root_dir = NULL; + CliprdrFuseFile* clip_data_dir = NULL; + size_t path_length = 0; WINPR_ASSERT(file_context); @@ -1759,9 +1759,9 @@ static CliprdrFuseFile* clip_data_dir_new(CliprdrFileContext* file_context, BOOL static char* get_parent_path(const char* filepath) { - char* base; - size_t parent_path_length; - char* parent_path; + char* base = NULL; + size_t parent_path_length = 0; + char* parent_path = NULL; base = strrchr(filepath, '/'); WINPR_ASSERT(base); @@ -1825,7 +1825,7 @@ static BOOL set_selection_for_clip_data_entry(CliprdrFileContext* file_context, CliprdrFuseClipDataEntry* clip_data_entry, FILEDESCRIPTORW* files, UINT32 n_files) { - CliprdrFuseFile* clip_data_dir; + CliprdrFuseFile* clip_data_dir = NULL; WINPR_ASSERT(file_context); WINPR_ASSERT(clip_data_entry); @@ -1843,9 +1843,9 @@ static BOOL set_selection_for_clip_data_entry(CliprdrFileContext* file_context, for (UINT32 i = 0; i < n_files; ++i) { FILEDESCRIPTORW* file = &files[i]; - CliprdrFuseFile* fuse_file; - char* filename; - size_t path_length; + CliprdrFuseFile* fuse_file = NULL; + char* filename = NULL; + size_t path_length = 0; fuse_file = fuse_file_new(); if (!fuse_file) @@ -1919,7 +1919,7 @@ static BOOL set_selection_for_clip_data_entry(CliprdrFileContext* file_context, } if (file->dwFlags & FD_WRITESTIME) { - UINT64 filetime; + UINT64 filetime = 0; filetime = file->ftLastWriteTime.dwHighDateTime; filetime <<= 32; @@ -1952,8 +1952,8 @@ static BOOL set_selection_for_clip_data_entry(CliprdrFileContext* file_context, static BOOL update_exposed_path(CliprdrFileContext* file_context, wClipboard* clip, CliprdrFuseClipDataEntry* clip_data_entry) { - wClipboardDelegate* delegate; - CliprdrFuseFile* clip_data_dir; + wClipboardDelegate* delegate = NULL; + CliprdrFuseFile* clip_data_dir = NULL; WINPR_ASSERT(file_context); WINPR_ASSERT(clip); @@ -1981,7 +1981,7 @@ BOOL cliprdr_file_context_update_server_data(CliprdrFileContext* file_context, w const void* data, size_t size) { #if defined(WITH_FUSE) - CliprdrFuseClipDataEntry* clip_data_entry; + CliprdrFuseClipDataEntry* clip_data_entry = NULL; FILEDESCRIPTORW* files = NULL; UINT32 n_files = 0; @@ -2369,7 +2369,7 @@ static void* UINTPointerClone(const void* other) #if defined(WITH_FUSE) static CliprdrFuseFile* fuse_file_new_root(CliprdrFileContext* file_context) { - CliprdrFuseFile* root_dir; + CliprdrFuseFile* root_dir = NULL; root_dir = fuse_file_new(); if (!root_dir) diff --git a/client/common/cmdline.c b/client/common/cmdline.c index 3485936d2..0da63282c 100644 --- a/client/common/cmdline.c +++ b/client/common/cmdline.c @@ -76,7 +76,7 @@ static BOOL freerdp_client_print_codepages(const char* arg) size_t count = 0; DWORD column = 2; const char* filter = NULL; - RDP_CODEPAGE* pages; + RDP_CODEPAGE* pages = NULL; if (arg) { @@ -113,7 +113,7 @@ static BOOL freerdp_path_valid(const char* path, BOOL* special) { const char DynamicDrives[] = "DynamicDrives"; BOOL isPath = FALSE; - BOOL isSpecial; + BOOL isSpecial = 0; if (!path) return FALSE; @@ -168,7 +168,7 @@ static char* name_from_path(const char* path) static BOOL freerdp_client_add_drive(rdpSettings* settings, const char* path, const char* name) { - char* dname; + char* dname = NULL; RDPDR_DEVICE* device = NULL; if (name) @@ -245,7 +245,7 @@ static BOOL copy_value(const char* value, char** dst) static BOOL value_to_int(const char* value, LONGLONG* result, LONGLONG min, LONGLONG max) { - long long rc; + long long rc = 0; if (!value || !result) return FALSE; @@ -265,7 +265,7 @@ static BOOL value_to_int(const char* value, LONGLONG* result, LONGLONG min, LONG static BOOL value_to_uint(const char* value, ULONGLONG* result, ULONGLONG min, ULONGLONG max) { - unsigned long long rc; + unsigned long long rc = 0; if (!value || !result) return FALSE; @@ -297,7 +297,7 @@ BOOL freerdp_client_print_buildconfig(void) static void freerdp_client_print_scancodes(void) { - DWORD x; + DWORD x = 0; printf("RDP scancodes and their name for use with /kbd:remap\n"); for (x = 0; x < UINT16_MAX; x++) @@ -310,7 +310,7 @@ static void freerdp_client_print_scancodes(void) static BOOL is_delimiter(char c, const char* delimiters) { - char d; + char d = 0; while ((d = *delimiters++) != '\0') { if (c == d) @@ -346,7 +346,7 @@ static SSIZE_T next_delimiter(const char* text, size_t len, size_t max, const ch static SSIZE_T forced_newline_at(const char* text, size_t len, size_t limit, const char* force_newline) { - char d; + char d = 0; while ((d = *force_newline++) != '\0') { const char* tok = strchr(text, d); @@ -377,7 +377,7 @@ static BOOL print_align(size_t start_offset, size_t* current) static char* print_token(char* text, size_t start_offset, size_t* current, size_t limit, const char* delimiters, const char* force_newline) { - int rc; + int rc = 0; const size_t tlen = strnlen(text, limit); size_t len = tlen; const SSIZE_T force_at = forced_newline_at(text, len, limit - *current, force_newline); @@ -467,7 +467,7 @@ static void freerdp_client_print_command_line_args(COMMAND_LINE_ARGUMENT_A* parg const COMMAND_LINE_ARGUMENT_A* arg = parg; do { - int rc; + int rc = 0; size_t pos = 0; const size_t description_offset = 30 + 8; @@ -680,8 +680,8 @@ static int freerdp_client_command_line_pre_filter(void* context, int index, int { if (index == 1) { - size_t length; - rdpSettings* settings; + size_t length = 0; + rdpSettings* settings = NULL; if (argc <= index) return -1; @@ -726,7 +726,7 @@ BOOL freerdp_client_add_device_channel(rdpSettings* settings, size_t count, cons if (option_equals(params[0], "drive")) { - BOOL rc; + BOOL rc = 0; if (count < 2) return FALSE; @@ -741,7 +741,7 @@ BOOL freerdp_client_add_device_channel(rdpSettings* settings, size_t count, cons } else if (option_equals(params[0], "printer")) { - RDPDR_DEVICE* printer; + RDPDR_DEVICE* printer = NULL; if (count < 1) return FALSE; @@ -765,7 +765,7 @@ BOOL freerdp_client_add_device_channel(rdpSettings* settings, size_t count, cons } else if (option_equals(params[0], "smartcard")) { - RDPDR_DEVICE* smartcard; + RDPDR_DEVICE* smartcard = NULL; if (count < 1) return FALSE; @@ -790,7 +790,7 @@ BOOL freerdp_client_add_device_channel(rdpSettings* settings, size_t count, cons } else if (option_equals(params[0], "serial")) { - RDPDR_DEVICE* serial; + RDPDR_DEVICE* serial = NULL; if (count < 1) return FALSE; @@ -815,7 +815,7 @@ BOOL freerdp_client_add_device_channel(rdpSettings* settings, size_t count, cons } else if (option_equals(params[0], "parallel")) { - RDPDR_DEVICE* parallel; + RDPDR_DEVICE* parallel = NULL; if (count < 1) return FALSE; @@ -849,7 +849,7 @@ BOOL freerdp_client_del_static_channel(rdpSettings* settings, const char* name) BOOL freerdp_client_add_static_channel(rdpSettings* settings, size_t count, const char** params) { - ADDIN_ARGV* _args; + ADDIN_ARGV* _args = NULL; if (!settings || !params || !params[0] || (count > INT_MAX)) return FALSE; @@ -878,7 +878,7 @@ BOOL freerdp_client_del_dynamic_channel(rdpSettings* settings, const char* name) BOOL freerdp_client_add_dynamic_channel(rdpSettings* settings, size_t count, const char** params) { - ADDIN_ARGV* _args; + ADDIN_ARGV* _args = NULL; if (!settings || !params || !params[0] || (count > INT_MAX)) return FALSE; @@ -933,7 +933,7 @@ static BOOL parseSubOptions(rdpSettings* settings, const CmdLineSubOptions* opts const char* arg) { BOOL found = FALSE; - size_t xx; + size_t xx = 0; for (xx = 0; xx < count; xx++) { @@ -943,7 +943,7 @@ static BOOL parseSubOptions(rdpSettings* settings, const CmdLineSubOptions* opts { const size_t optlen = strlen(opt->optname); const char* val = &arg[optlen]; - BOOL status; + BOOL status = 0; switch (opt->opttype) { @@ -988,7 +988,7 @@ static int freerdp_client_command_line_post_filter(void* context, COMMAND_LINE_A CommandLineSwitchStart(arg) CommandLineSwitchCase(arg, "a") { - size_t count; + size_t count = 0; ptr.p = CommandLineParseCommaSeparatedValues(arg->Value, &count); if ((status = freerdp_client_add_device_channel(settings, count, ptr.pc))) @@ -1000,12 +1000,12 @@ static int freerdp_client_command_line_post_filter(void* context, COMMAND_LINE_A } CommandLineSwitchCase(arg, "kerberos") { - size_t count; + size_t count = 0; ptr.p = CommandLineParseCommaSeparatedValuesEx("kerberos", arg->Value, &count); if (ptr.pc) { - size_t x; + size_t x = 0; const CmdLineSubOptions opts[] = { { "kdc-url:", FreeRDP_KerberosKdcUrl, CMDLINE_SUBOPTION_STRING, NULL }, { "start-time:", FreeRDP_KerberosStartTime, CMDLINE_SUBOPTION_STRING, NULL }, @@ -1033,56 +1033,56 @@ static int freerdp_client_command_line_post_filter(void* context, COMMAND_LINE_A CommandLineSwitchCase(arg, "vc") { - size_t count; + size_t count = 0; ptr.p = CommandLineParseCommaSeparatedValues(arg->Value, &count); status = freerdp_client_add_static_channel(settings, count, ptr.pc); free(ptr.p); } CommandLineSwitchCase(arg, "dvc") { - size_t count; + size_t count = 0; ptr.p = CommandLineParseCommaSeparatedValues(arg->Value, &count); status = freerdp_client_add_dynamic_channel(settings, count, ptr.pc); free(ptr.p); } CommandLineSwitchCase(arg, "drive") { - size_t count; + size_t count = 0; ptr.p = CommandLineParseCommaSeparatedValuesEx(arg->Name, arg->Value, &count); status = freerdp_client_add_device_channel(settings, count, ptr.pc); free(ptr.p); } CommandLineSwitchCase(arg, "serial") { - size_t count; + size_t count = 0; ptr.p = CommandLineParseCommaSeparatedValuesEx(arg->Name, arg->Value, &count); status = freerdp_client_add_device_channel(settings, count, ptr.pc); free(ptr.p); } CommandLineSwitchCase(arg, "parallel") { - size_t count; + size_t count = 0; ptr.p = CommandLineParseCommaSeparatedValuesEx(arg->Name, arg->Value, &count); status = freerdp_client_add_device_channel(settings, count, ptr.pc); free(ptr.p); } CommandLineSwitchCase(arg, "smartcard") { - size_t count; + size_t count = 0; ptr.p = CommandLineParseCommaSeparatedValuesEx(arg->Name, arg->Value, &count); status = freerdp_client_add_device_channel(settings, count, ptr.pc); free(ptr.p); } CommandLineSwitchCase(arg, "printer") { - size_t count; + size_t count = 0; ptr.p = CommandLineParseCommaSeparatedValuesEx(arg->Name, arg->Value, &count); status = freerdp_client_add_device_channel(settings, count, ptr.pc); free(ptr.p); } CommandLineSwitchCase(arg, "usb") { - size_t count; + size_t count = 0; ptr.p = CommandLineParseCommaSeparatedValuesEx(URBDRC_CHANNEL_NAME, arg->Value, &count); status = freerdp_client_add_dynamic_channel(settings, count, ptr.pc); free(ptr.p); @@ -1127,7 +1127,7 @@ static int freerdp_client_command_line_post_filter(void* context, COMMAND_LINE_A } CommandLineSwitchCase(arg, "sound") { - size_t count; + size_t count = 0; ptr.p = CommandLineParseCommaSeparatedValuesEx(RDPSND_CHANNEL_NAME, arg->Value, &count); status = freerdp_client_add_static_channel(settings, count, ptr.pc); if (status) @@ -1138,7 +1138,7 @@ static int freerdp_client_command_line_post_filter(void* context, COMMAND_LINE_A } CommandLineSwitchCase(arg, "microphone") { - size_t count; + size_t count = 0; ptr.p = CommandLineParseCommaSeparatedValuesEx(AUDIN_CHANNEL_NAME, arg->Value, &count); status = freerdp_client_add_dynamic_channel(settings, count, ptr.pc); free(ptr.p); @@ -1146,7 +1146,7 @@ static int freerdp_client_command_line_post_filter(void* context, COMMAND_LINE_A #if defined(CHANNEL_TSMF_CLIENT) CommandLineSwitchCase(arg, "multimedia") { - size_t count; + size_t count = 0; ptr.p = CommandLineParseCommaSeparatedValuesEx("tsmf", arg->Value, &count); status = freerdp_client_add_dynamic_channel(settings, count, ptr.pc); free(ptr.p); @@ -1266,13 +1266,13 @@ BOOL freerdp_parse_username(const char* username, char** puser, char** pdomain) BOOL freerdp_parse_hostname(const char* hostname, char** host, int* port) { - char* p; + char* p = NULL; p = strrchr(hostname, ':'); if (p) { size_t length = (size_t)(p - hostname); - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(p + 1, &val, 1, UINT16_MAX)) return FALSE; @@ -1396,7 +1396,7 @@ BOOL freerdp_set_connection_type(rdpSettings* settings, UINT32 type) static UINT32 freerdp_get_keyboard_layout_for_type(const char* name, DWORD type) { size_t count = 0; - size_t x; + size_t x = 0; RDP_KEYBOARD_LAYOUT* layouts = freerdp_keyboard_get_layouts(RDP_KEYBOARD_LAYOUT_TYPE_STANDARD, &count); @@ -1418,7 +1418,7 @@ static UINT32 freerdp_get_keyboard_layout_for_type(const char* name, DWORD type) static UINT32 freerdp_map_keyboard_layout_name_to_id(const char* name) { - size_t x; + size_t x = 0; const UINT32 variants[] = { RDP_KEYBOARD_LAYOUT_TYPE_STANDARD, RDP_KEYBOARD_LAYOUT_TYPE_VARIANT, RDP_KEYBOARD_LAYOUT_TYPE_IME }; @@ -1434,7 +1434,7 @@ static UINT32 freerdp_map_keyboard_layout_name_to_id(const char* name) static int freerdp_detect_command_line_pre_filter(void* context, int index, int argc, LPSTR* argv) { - size_t length; + size_t length = 0; WINPR_UNUSED(context); if (index == 1) @@ -1467,10 +1467,10 @@ static int freerdp_detect_command_line_pre_filter(void* context, int index, int static int freerdp_detect_windows_style_command_line_syntax(int argc, char** argv, size_t* count, BOOL ignoreUnknown) { - int status; - DWORD flags; - int detect_status; - const COMMAND_LINE_ARGUMENT_A* arg; + int status = 0; + DWORD flags = 0; + int detect_status = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; COMMAND_LINE_ARGUMENT_A largs[ARRAYSIZE(global_cmd_args)]; memcpy(largs, global_cmd_args, sizeof(global_cmd_args)); @@ -1510,10 +1510,10 @@ static int freerdp_detect_windows_style_command_line_syntax(int argc, char** arg static int freerdp_detect_posix_style_command_line_syntax(int argc, char** argv, size_t* count, BOOL ignoreUnknown) { - int status; - DWORD flags; - int detect_status; - const COMMAND_LINE_ARGUMENT_A* arg; + int status = 0; + DWORD flags = 0; + int detect_status = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; COMMAND_LINE_ARGUMENT_A largs[ARRAYSIZE(global_cmd_args)]; memcpy(largs, global_cmd_args, sizeof(global_cmd_args)); @@ -1553,10 +1553,10 @@ static int freerdp_detect_posix_style_command_line_syntax(int argc, char** argv, static BOOL freerdp_client_detect_command_line(int argc, char** argv, DWORD* flags) { - int posix_cli_status; - size_t posix_cli_count; - int windows_cli_status; - size_t windows_cli_count; + int posix_cli_status = 0; + size_t posix_cli_count = 0; + int windows_cli_status = 0; + size_t windows_cli_count = 0; const BOOL ignoreUnknown = TRUE; windows_cli_status = freerdp_detect_windows_style_command_line_syntax( argc, argv, &windows_cli_count, ignoreUnknown); @@ -1599,9 +1599,9 @@ int freerdp_client_settings_command_line_status_print(rdpSettings* settings, int static void freerdp_client_print_keyboard_type_list(const char* msg, DWORD type) { - size_t x; + size_t x = 0; size_t count = 0; - RDP_KEYBOARD_LAYOUT* layouts; + RDP_KEYBOARD_LAYOUT* layouts = NULL; layouts = freerdp_keyboard_get_layouts(type, &count); printf("\n%s\n", msg); @@ -1688,7 +1688,7 @@ int freerdp_client_settings_command_line_status_print_ex(rdpSettings* settings, int argc, char** argv, const COMMAND_LINE_ARGUMENT_A* custom) { - const COMMAND_LINE_ARGUMENT_A* arg; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; COMMAND_LINE_ARGUMENT_A largs[ARRAYSIZE(global_cmd_args)]; memcpy(largs, global_cmd_args, sizeof(global_cmd_args)); @@ -1867,9 +1867,9 @@ out: */ static BOOL parseSizeValue(const char* input, unsigned long* v1, unsigned long* v2) { - const char* xcharpos; - char* endPtr; - unsigned long v; + const char* xcharpos = NULL; + char* endPtr = NULL; + unsigned long v = 0; errno = 0; v = strtoul(input, &endPtr, 10); @@ -1902,7 +1902,7 @@ static BOOL parseSizeValue(const char* input, unsigned long* v1, unsigned long* static BOOL prepare_default_settings(rdpSettings* settings, COMMAND_LINE_ARGUMENT_A* args, BOOL rdp_file) { - size_t x; + size_t x = 0; const char* arguments[] = { "network", "gfx", "rfx", "bpp" }; WINPR_ASSERT(settings); WINPR_ASSERT(args); @@ -2030,7 +2030,7 @@ static int parse_tls_ciphers(rdpSettings* settings, const char* Value) static int parse_tls_seclevel(rdpSettings* settings, const char* Value) { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(Value, &val, 0, 5)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -2138,8 +2138,8 @@ static int parse_tls_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_ WINPR_ASSERT(settings); WINPR_ASSERT(arg); - size_t count; - size_t x; + size_t count = 0; + size_t x = 0; char** ptr = CommandLineParseCommaSeparatedValues(arg->Value, &count); for (x = 0; x < count; x++) { @@ -2224,7 +2224,7 @@ static int parse_gfx_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_ } else if (option_starts_with("mask:", val)) { - ULONGLONG v; + ULONGLONG v = 0; const char* uv = &val[5]; if (!value_to_uint(uv, &v, 0, UINT32_MAX)) rc = COMMAND_LINE_ERROR; @@ -2287,7 +2287,7 @@ static int parse_kbd_layout(rdpSettings* settings, const char* value) WINPR_ASSERT(value); int rc = 0; - LONGLONG ival; + LONGLONG ival = 0; const BOOL isInt = value_to_int(value, &ival, 1, UINT32_MAX); if (!isInt) { @@ -2349,8 +2349,8 @@ static int parse_codec_cache_options(rdpSettings* settings, const COMMAND_LINE_A static BOOL check_kbd_remap_valid(const char* token) { - DWORD key; - DWORD value; + DWORD key = 0; + DWORD value = 0; WINPR_ASSERT(token); /* The remapping is only allowed for scancodes, so maximum is 999=999 */ @@ -2395,8 +2395,8 @@ static int parse_host_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT if (p) { - LONGLONG val; - size_t length; + LONGLONG val = 0; + size_t length = 0; if (!value_to_int(&p[1], &val, 1, UINT16_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -2416,7 +2416,7 @@ static int parse_host_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT } else /* ipv6 */ { - size_t length; + size_t length = 0; char* p2 = strchr(arg->Value, ']'); /* not a valid [] ipv6 addr found */ @@ -2429,7 +2429,7 @@ static int parse_host_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT if (*(p2 + 1) == ':') { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(&p2[2], &val, 0, UINT16_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -2460,7 +2460,7 @@ static int parse_redirect_prefer_options(rdpSettings* settings, const COMMAND_LI UINT32 value = 0; do { - UINT32 mask; + UINT32 mask = 0; char* next = strchr(cur, ','); if (next) @@ -2503,7 +2503,7 @@ static int parse_prevent_session_lock_options(rdpSettings* settings, if (arg->Flags & COMMAND_LINE_VALUE_PRESENT) { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 1, UINT32_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -2549,8 +2549,8 @@ static int parse_size_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT if (p) { - unsigned long w; - unsigned long h; + unsigned long w = 0; + unsigned long h = 0; if (!parseSizeValue(arg->Value, &w, &h) || (w > UINT16_MAX) || (h > UINT16_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -2596,7 +2596,7 @@ static int parse_size_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT *p = '\0'; { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(str, &val, 0, 100)) { @@ -2628,7 +2628,7 @@ static int parse_monitors_options(rdpSettings* settings, const COMMAND_LINE_ARGU const char** pc; } ptr; size_t count = 0; - UINT32* MonitorIds; + UINT32* MonitorIds = NULL; ptr.p = CommandLineParseCommaSeparatedValues(arg->Value, &count); if (!ptr.pc) @@ -2646,7 +2646,7 @@ static int parse_monitors_options(rdpSettings* settings, const COMMAND_LINE_ARGU MonitorIds = freerdp_settings_get_pointer_array_writable(settings, FreeRDP_MonitorIds, 0); for (UINT32 i = 0; i < count; i++) { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(ptr.pc[i], &val, 0, UINT16_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -2696,8 +2696,8 @@ static int parse_smart_sizing_options(rdpSettings* settings, const COMMAND_LINE_ if (arg->Value) { - unsigned long w; - unsigned long h; + unsigned long w = 0; + unsigned long h = 0; if (!parseSizeValue(arg->Value, &w, &h) || (w > UINT16_MAX) || (h > UINT16_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -2715,7 +2715,7 @@ static int parse_bpp_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_ WINPR_ASSERT(settings); WINPR_ASSERT(arg); - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 0, UINT32_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -2789,7 +2789,7 @@ static int parse_kbd_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_ } else if (option_starts_with("lang:", val)) { - LONGLONG ival; + LONGLONG ival = 0; const BOOL isInt = value_to_int(&val[5], &ival, 1, UINT32_MAX); if (!isInt) rc = COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -2799,7 +2799,7 @@ static int parse_kbd_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_ } else if (option_starts_with("type:", val)) { - LONGLONG ival; + LONGLONG ival = 0; const BOOL isInt = value_to_int(&val[5], &ival, 1, UINT32_MAX); if (!isInt) rc = COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -2808,7 +2808,7 @@ static int parse_kbd_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_ } else if (option_starts_with("subtype:", val)) { - LONGLONG ival; + LONGLONG ival = 0; const BOOL isInt = value_to_int(&val[8], &ival, 1, UINT32_MAX); if (!isInt) rc = COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -2818,7 +2818,7 @@ static int parse_kbd_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_ } else if (option_starts_with("fn-key:", val)) { - LONGLONG ival; + LONGLONG ival = 0; const BOOL isInt = value_to_int(&val[7], &ival, 1, UINT32_MAX); if (!isInt) rc = COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -2945,8 +2945,8 @@ static int parse_clipboard_options(rdpSettings* settings, const COMMAND_LINE_ARG char** p; const char** pc; } ptr; - size_t count; - size_t x; + size_t count = 0; + size_t x = 0; ptr.p = CommandLineParseCommaSeparatedValues(arg->Value, &count); for (x = 0; (x < count) && (rc == 0); x++) { @@ -3038,7 +3038,7 @@ static int parse_audio_mode_options(rdpSettings* settings, const COMMAND_LINE_AR WINPR_ASSERT(settings); WINPR_ASSERT(arg); - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 0, UINT32_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -3094,7 +3094,7 @@ static int parse_network_options(rdpSettings* settings, const COMMAND_LINE_ARGUM } else { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 1, 7)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -3113,7 +3113,7 @@ static int parse_sec_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_ WINPR_ASSERT(arg); size_t count = 0; - size_t x; + size_t x = 0; char** ptr = CommandLineParseCommaSeparatedValues(arg->Value, &count); if (count == 0) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -3130,7 +3130,7 @@ static int parse_sec_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_ } const BOOL val = bval != PARSE_OFF; - FreeRDP_Settings_Keys_Bool id; + FreeRDP_Settings_Keys_Bool id = FreeRDP_BOOL_UNUSED; if (option_starts_with("rdp", cur)) /* Standard RDP */ { id = FreeRDP_RdpSecurity; @@ -3232,8 +3232,8 @@ static int parse_cert_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT char** p; const char** pc; } ptr; - size_t count; - size_t x; + size_t count = 0; + size_t x = 0; ptr.p = CommandLineParseCommaSeparatedValues(arg->Value, &count); for (x = 0; (x < count) && (rc == 0); x++) { @@ -3408,7 +3408,7 @@ static int parse_reconnect_cookie_options(rdpSettings* settings, const COMMAND_L WINPR_ASSERT(arg); BYTE* base64 = NULL; - size_t length; + size_t length = 0; if (!arg->Value) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -3434,7 +3434,7 @@ static int parse_scale_options(rdpSettings* settings, const COMMAND_LINE_ARGUMEN WINPR_ASSERT(settings); WINPR_ASSERT(arg); - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 100, 180)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -3461,7 +3461,7 @@ static int parse_scale_device_options(rdpSettings* settings, const COMMAND_LINE_ WINPR_ASSERT(settings); WINPR_ASSERT(arg); - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 100, 180)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -3486,7 +3486,7 @@ static int parse_smartcard_logon_options(rdpSettings* settings, const COMMAND_LI WINPR_ASSERT(settings); WINPR_ASSERT(arg); - size_t count; + size_t count = 0; union { char** p; @@ -3499,7 +3499,7 @@ static int parse_smartcard_logon_options(rdpSettings* settings, const COMMAND_LI ptr.p = CommandLineParseCommaSeparatedValuesEx("smartcard-logon", arg->Value, &count); if (ptr.pc) { - size_t x; + size_t x = 0; const CmdLineSubOptions opts[] = { { "cert:", FreeRDP_SmartcardCertificate, CMDLINE_SUBOPTION_FILE, setSmartcardEmulation }, @@ -3530,8 +3530,8 @@ static int parse_tune_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT WINPR_ASSERT(settings); WINPR_ASSERT(arg); - size_t x; - size_t count; + size_t x = 0; + size_t count = 0; union { char** p; @@ -4043,13 +4043,13 @@ static int freerdp_client_settings_parse_command_line_arguments_int( int (*handle_option)(const COMMAND_LINE_ARGUMENT* arg, void* custom), void* handle_userdata) { char* user = NULL; - int status; + int status = 0; BOOL ext = FALSE; BOOL assist = FALSE; DWORD flags = 0; BOOL promptForPassword = FALSE; BOOL compatibility = FALSE; - const COMMAND_LINE_ARGUMENT_A* arg; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; /* Command line detection fails if only a .rdp or .msrcIncident file * is supplied. Check this case first, only then try to detect @@ -4167,7 +4167,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "w") { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, -1, UINT32_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -4177,7 +4177,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "h") { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, -1, UINT32_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -4308,7 +4308,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "kbd-lang") { - LONGLONG val; + LONGLONG val = 0; WLog_WARN(TAG, "/kbd-lang: is deprecated, use /kbd:lang: instead"); if (!value_to_int(arg->Value, &val, 1, UINT32_MAX)) @@ -4323,7 +4323,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "kbd-type") { - LONGLONG val; + LONGLONG val = 0; WLog_WARN(TAG, "/kbd-type: is deprecated, use /kbd:type: instead"); if (!value_to_int(arg->Value, &val, 0, UINT32_MAX)) @@ -4340,7 +4340,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "kbd-subtype") { - LONGLONG val; + LONGLONG val = 0; WLog_WARN(TAG, "/kbd-subtype: is deprecated, use /kbd:subtype: instead"); if (!value_to_int(arg->Value, &val, 0, UINT32_MAX)) @@ -4351,7 +4351,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "kbd-fn-key") { - LONGLONG val; + LONGLONG val = 0; WLog_WARN(TAG, "/kbd-fn-key: is deprecated, use /kbd:fn-key: instead"); if (!value_to_int(arg->Value, &val, 0, UINT32_MAX)) @@ -4485,7 +4485,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "compression-level") { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 0, UINT32_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -4568,8 +4568,8 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "window-position") { - unsigned long x; - unsigned long y; + unsigned long x = 0; + unsigned long y = 0; if (!arg->Value) return COMMAND_LINE_ERROR_MISSING_ARGUMENT; @@ -4597,7 +4597,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "timeout") { - ULONGLONG val; + ULONGLONG val = 0; if (!value_to_uint(arg->Value, &val, 1, 600000)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; if (!freerdp_settings_set_uint32(settings, FreeRDP_TcpAckTimeout, (UINT32)val)) @@ -4704,7 +4704,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "frame-ack") { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 0, UINT32_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -4726,7 +4726,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "jpeg-quality") { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 0, 100)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -4750,7 +4750,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "pcid") { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 0, UINT32_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -4974,7 +4974,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "parent-window") { - ULONGLONG val; + ULONGLONG val = 0; if (!value_to_uint(arg->Value, &val, 0, UINT64_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -4984,7 +4984,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "client-build-number") { - ULONGLONG val; + ULONGLONG val = 0; if (!value_to_uint(arg->Value, &val, 0, UINT32_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -5045,7 +5045,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( #endif CommandLineSwitchCase(arg, "max-fast-path-size") { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 0, UINT32_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -5101,7 +5101,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "auto-reconnect-max-retries") { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 0, 1000)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -5123,7 +5123,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "pwidth") { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 0, UINT32_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -5133,7 +5133,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "pheight") { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 0, UINT32_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -5143,7 +5143,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "orientation") { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 0, UINT16_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -5164,7 +5164,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( } CommandLineSwitchCase(arg, "scale-desktop") { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 100, 500)) return FALSE; @@ -5282,7 +5282,7 @@ static int freerdp_client_settings_parse_command_line_arguments_int( arg = CommandLineFindArgumentA(largs, "port"); if (arg->Flags & COMMAND_LINE_ARGUMENT_PRESENT) { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(arg->Value, &val, 1, UINT16_MAX)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; @@ -5631,8 +5631,8 @@ BOOL freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings) * Very similar to DevicesToRedirect, but can contain a * comma-separated list of drive letters to redirect. */ - char* value; - char* tok; + char* value = NULL; + char* tok = NULL; char* context = NULL; value = _strdup(DrivesToRedirect); @@ -5658,7 +5658,7 @@ BOOL freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings) * ... One or more paths to redirect. */ /* TODO: Need to properly escape labels and paths */ - BOOL success; + BOOL success = 0; const char* name = NULL; const char* drive = tok; char* subcontext = NULL; diff --git a/client/common/file.c b/client/common/file.c index 83f27358f..06be2fa3c 100644 --- a/client/common/file.c +++ b/client/common/file.c @@ -655,8 +655,8 @@ static BOOL freerdp_client_rdp_file_set_integer(rdpFile* file, const char* name, static BOOL freerdp_client_parse_rdp_file_integer(rdpFile* file, const char* name, const char* value) { - char* endptr; - long ivalue; + char* endptr = NULL; + long ivalue = 0; errno = 0; ivalue = strtol(value, &endptr, 0); @@ -748,8 +748,8 @@ static SSIZE_T freerdp_client_rdp_file_add_line(rdpFile* file) while ((file->lineCount + 1) > file->lineSize) { - size_t new_size; - rdpFileLine* new_line; + size_t new_size = 0; + rdpFileLine* new_line = NULL; new_size = file->lineSize * 2; new_line = (rdpFileLine*)realloc(file->lines, new_size * sizeof(rdpFileLine)); @@ -783,9 +783,9 @@ BOOL freerdp_client_parse_rdp_file_buffer(rdpFile* file, const BYTE* buffer, siz static BOOL trim(char** strptr) { - char* start; - char* str; - char* end; + char* start = NULL; + char* str = NULL; + char* end = NULL; start = str = *strptr; if (!str) @@ -880,15 +880,15 @@ BOOL freerdp_client_parse_rdp_file_buffer_ex(rdpFile* file, const BYTE* buffer, rdp_file_fkt_parse parse) { BOOL rc = FALSE; - size_t length; - char* line; - char* type; - char* context; - char* d1; - char* d2; - char* beg; - char* name; - char* value; + size_t length = 0; + char* line = NULL; + char* type = NULL; + char* context = NULL; + char* d1 = NULL; + char* d2 = NULL; + char* beg = NULL; + char* name = NULL; + char* value = NULL; char* copy = NULL; if (!file) @@ -993,11 +993,11 @@ BOOL freerdp_client_parse_rdp_file(rdpFile* file, const char* name) BOOL freerdp_client_parse_rdp_file_ex(rdpFile* file, const char* name, rdp_file_fkt_parse parse) { - BOOL status; - BYTE* buffer; + BOOL status = 0; + BYTE* buffer = NULL; FILE* fp = NULL; - size_t read_size; - INT64 file_size; + size_t read_size = 0; + INT64 file_size = 0; const char* fname = name; if (!file || !name) @@ -1105,8 +1105,8 @@ static BOOL rdp_opt_duplicate(const rdpSettings* _settings, FreeRDP_Settings_Key BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSettings* settings) { - FreeRDP_Settings_Keys_String index; - UINT32 LoadBalanceInfoLength; + FreeRDP_Settings_Keys_String index = FreeRDP_STRING_UNUSED; + UINT32 LoadBalanceInfoLength = 0; const char* GatewayHostname = NULL; char* redirectCameras = NULL; char* redirectUsb = NULL; @@ -1272,7 +1272,7 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett file->EncodeRedirectedVideoCapture = 0; if (str) { - unsigned long val; + unsigned long val = 0; errno = 0; val = strtoul(str, NULL, 0); if ((val < UINT32_MAX) && (errno == 0)) @@ -1284,7 +1284,7 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett file->RedirectedVideoCaptureEncodingQuality = 0; if (str) { - unsigned long val; + unsigned long val = 0; errno = 0; val = strtoul(str, NULL, 0); if ((val <= 2) && (errno == 0)) @@ -1318,7 +1318,7 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett { size_t offset = 0; - UINT32 x; + UINT32 x = 0; UINT32 count = freerdp_settings_get_uint32(settings, FreeRDP_NumMonitorIds); const UINT32* MonitorIds = freerdp_settings_get_pointer(settings, FreeRDP_MonitorIds); /* String size: 10 char UINT32 max string length, 1 char separator, one element NULL */ @@ -1348,9 +1348,9 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett BOOL freerdp_client_write_rdp_file(const rdpFile* file, const char* name, BOOL unicode) { - FILE* fp; - size_t size; - char* buffer; + FILE* fp = NULL; + size_t size = 0; + char* buffer = NULL; int status = 0; WCHAR* unicodestr = NULL; @@ -1420,9 +1420,9 @@ static SSIZE_T freerdp_client_write_setting_to_buffer(char** buffer, size_t* buf WINPR_FORMAT_ARG const char* fmt, ...) { va_list ap; - SSIZE_T len; - char* buf; - size_t bufSize; + SSIZE_T len = 0; + char* buf = NULL; + size_t bufSize = 0; if (!buffer || !bufferSize || !fmt) return -1; @@ -1625,8 +1625,8 @@ size_t freerdp_client_write_rdp_file_buffer(const rdpFile* file, char* buffer, s static ADDIN_ARGV* rdp_file_to_args(const char* channel, const char* values) { - size_t count; - size_t x; + size_t count = 0; + size_t x = 0; char** p = NULL; ADDIN_ARGV* args = freerdp_addin_argv_new(0, NULL); if (!args) @@ -1637,7 +1637,7 @@ static ADDIN_ARGV* rdp_file_to_args(const char* channel, const char* values) p = CommandLineParseCommaSeparatedValues(values, &count); for (x = 0; x < count; x++) { - BOOL rc; + BOOL rc = 0; const char* val = p[x]; const size_t len = strlen(val) + 8; char* str = calloc(len, sizeof(char)); @@ -2424,9 +2424,9 @@ BOOL freerdp_client_populate_settings_from_rdp_file(const rdpFile* file, rdpSett if (~(size_t)file->SelectedMonitors) { size_t count = 0; - size_t x; + size_t x = 0; char** args = CommandLineParseCommaSeparatedValues(file->SelectedMonitors, &count); - UINT32* list; + UINT32* list = NULL; if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorIds, NULL, count)) { @@ -2441,7 +2441,7 @@ BOOL freerdp_client_populate_settings_from_rdp_file(const rdpFile* file, rdpSett } for (x = 0; x < count; x++) { - unsigned long val; + unsigned long val = 0; errno = 0; val = strtoul(args[x], NULL, 0); if ((val >= UINT32_MAX) && (errno != 0)) @@ -2544,7 +2544,7 @@ BOOL freerdp_client_populate_settings_from_rdp_file(const rdpFile* file, rdpSett static rdpFileLine* freerdp_client_rdp_file_find_line_by_name(const rdpFile* file, const char* name) { - size_t index; + size_t index = 0; BOOL bFound = FALSE; rdpFileLine* line = NULL; @@ -2661,7 +2661,7 @@ void freerdp_client_rdp_file_free(rdpFile* file) { if (file->lineCount) { - size_t i; + size_t i = 0; for (i = 0; i < file->lineCount; i++) { free(file->lines[i].name); diff --git a/client/common/man/generate_argument_docbook.c b/client/common/man/generate_argument_docbook.c index b1fcb9410..156d80966 100644 --- a/client/common/man/generate_argument_docbook.c +++ b/client/common/man/generate_argument_docbook.c @@ -39,7 +39,7 @@ static char* append(char** buffer, size_t* size, const char* str) static LPSTR tr_esc_str(LPCSTR arg, bool format) { - const char* str; + const char* str = NULL; LPSTR tmp = NULL; size_t ds = 0; diff --git a/client/common/test/TestClientChannels.c b/client/common/test/TestClientChannels.c index 9a89a561a..0522a3cae 100644 --- a/client/common/test/TestClientChannels.c +++ b/client/common/test/TestClientChannels.c @@ -8,10 +8,10 @@ int TestClientChannels(int argc, char* argv[]) { - int index; - DWORD dwFlags; - FREERDP_ADDIN* pAddin; - FREERDP_ADDIN** ppAddins; + int index = 0; + DWORD dwFlags = 0; + FREERDP_ADDIN* pAddin = NULL; + FREERDP_ADDIN** ppAddins = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/client/common/test/TestClientCmdLine.c b/client/common/test/TestClientCmdLine.c index 48b3d408f..b580eb4ba 100644 --- a/client/common/test/TestClientCmdLine.c +++ b/client/common/test/TestClientCmdLine.c @@ -30,7 +30,7 @@ typedef BOOL (*validate_settings_pr)(rdpSettings* settings); static void print_test_title(int argc, char** argv) { - int i; + int i = 0; printf("Running test:"); for (i = 0; i < argc; i++) @@ -44,7 +44,7 @@ static void print_test_title(int argc, char** argv) static INLINE BOOL testcase(const char* name, char** argv, size_t argc, int expected_return, validate_settings_pr validate_settings) { - int status; + int status = 0; BOOL valid_settings = TRUE; rdpSettings* settings = freerdp_settings_new(0); print_test_title(argc, argv); @@ -212,8 +212,8 @@ static const test tests[] = { static void check_modified_arguments(const test* test, char** command_line, int* rc) { - int k; - const char* expected_argument; + int k = 0; + const char* expected_argument = NULL; for (k = 0; (expected_argument = test->modified_arguments[k].expected_value); k++) { @@ -234,7 +234,7 @@ static void check_modified_arguments(const test* test, char** command_line, int* int TestClientCmdLine(int argc, char* argv[]) { int rc = 0; - size_t i; + size_t i = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/client/common/test/TestClientRdpFile.c b/client/common/test/TestClientRdpFile.c index e5f2baa8d..f8696229e 100644 --- a/client/common/test/TestClientRdpFile.c +++ b/client/common/test/TestClientRdpFile.c @@ -237,8 +237,8 @@ static char testRdpFileUTF8[] = static char* append(const char* fmt, ...) { - int rc; - char* dst; + int rc = 0; + char* dst = NULL; va_list ap; va_start(ap, fmt); @@ -264,17 +264,17 @@ static char* append(const char* fmt, ...) int TestClientRdpFile(int argc, char* argv[]) { int rc = -1; - int iValue; - UINT32 uValue; - const UINT32* puValue; - const char* sValue; + int iValue = 0; + UINT32 uValue = 0; + const UINT32* puValue = NULL; + const char* sValue = NULL; char* utfname = NULL; char* uniname = NULL; char* base = NULL; char* tmp = NULL; - UINT64 id; - rdpFile* file; - rdpSettings* settings; + UINT64 id = 0; + rdpFile* file = NULL; + rdpSettings* settings = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); @@ -422,8 +422,8 @@ int TestClientRdpFile(int argc, char* argv[]) /* Check [MS-RDPECAM] related options */ #if defined(CHANNEL_RDPECAM_CLIENT) { - int x; - ADDIN_ARGV* args; + int x = 0; + ADDIN_ARGV* args = NULL; iValue = freerdp_client_rdp_file_get_integer_option(file, "encode redirected video capture"); if (iValue != 1) @@ -465,7 +465,7 @@ int TestClientRdpFile(int argc, char* argv[]) /* Check [URBDRC] related options */ #if defined(CHANNEL_URBDRC_CLIENT) { - int x; + int x = 0; ADDIN_ARGV* args = freerdp_dynamic_channel_collection_find(settings, "urbdrc"); if (!args) { diff --git a/include/freerdp/channels/rdpemsc.h b/include/freerdp/channels/rdpemsc.h index 9b62ceeed..462035848 100644 --- a/include/freerdp/channels/rdpemsc.h +++ b/include/freerdp/channels/rdpemsc.h @@ -61,6 +61,7 @@ extern "C" typedef enum { + RDP_MOUSE_CURSOR_CAPVERSION_INVALID = 0x00000000, RDP_MOUSE_CURSOR_CAPVERSION_1 = 0x00000001, } RDP_MOUSE_CURSOR_CAPVERSION; diff --git a/libfreerdp/cache/bitmap.c b/libfreerdp/cache/bitmap.c index d0eb895bf..ee18501bc 100644 --- a/libfreerdp/cache/bitmap.c +++ b/libfreerdp/cache/bitmap.c @@ -45,8 +45,8 @@ static BOOL bitmap_cache_put(rdpBitmapCache* bitmap_cache, UINT32 id, UINT32 ind static BOOL update_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) { - rdpBitmap* bitmap; - rdpCache* cache; + rdpBitmap* bitmap = NULL; + rdpCache* cache = NULL; cache = context->cache; @@ -65,8 +65,8 @@ static BOOL update_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) static BOOL update_gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt) { - BYTE style; - rdpBitmap* bitmap; + BYTE style = 0; + rdpBitmap* bitmap = NULL; rdpCache* cache = context->cache; rdpBrush* brush = &mem3blt->brush; BOOL ret = TRUE; @@ -100,8 +100,8 @@ static BOOL update_gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt) static BOOL update_gdi_cache_bitmap(rdpContext* context, const CACHE_BITMAP_ORDER* cacheBitmap) { - rdpBitmap* bitmap; - rdpBitmap* prevBitmap; + rdpBitmap* bitmap = NULL; + rdpBitmap* prevBitmap = NULL; rdpCache* cache = context->cache; bitmap = Bitmap_Alloc(context); @@ -133,7 +133,7 @@ static BOOL update_gdi_cache_bitmap(rdpContext* context, const CACHE_BITMAP_ORDE static BOOL update_gdi_cache_bitmap_v2(rdpContext* context, CACHE_BITMAP_V2_ORDER* cacheBitmapV2) { - rdpBitmap* prevBitmap; + rdpBitmap* prevBitmap = NULL; rdpCache* cache = context->cache; rdpSettings* settings = context->settings; rdpBitmap* bitmap = Bitmap_Alloc(context); @@ -174,8 +174,8 @@ fail: static BOOL update_gdi_cache_bitmap_v3(rdpContext* context, CACHE_BITMAP_V3_ORDER* cacheBitmapV3) { - rdpBitmap* bitmap; - rdpBitmap* prevBitmap; + rdpBitmap* bitmap = NULL; + rdpBitmap* prevBitmap = NULL; BOOL compressed = TRUE; rdpCache* cache = context->cache; rdpSettings* settings = context->settings; @@ -214,7 +214,7 @@ fail: rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmapCache, UINT32 id, UINT32 index) { - rdpBitmap* bitmap; + rdpBitmap* bitmap = NULL; if (id >= bitmapCache->maxCells) { @@ -260,7 +260,7 @@ BOOL bitmap_cache_put(rdpBitmapCache* bitmapCache, UINT32 id, UINT32 index, rdpB void bitmap_cache_register_callbacks(rdpUpdate* update) { - rdpCache* cache; + rdpCache* cache = NULL; WINPR_ASSERT(update); WINPR_ASSERT(update->context); @@ -344,9 +344,9 @@ end: rdpBitmapCache* bitmap_cache_new(rdpContext* context) { - UINT32 i; - rdpSettings* settings; - rdpBitmapCache* bitmapCache; + UINT32 i = 0; + rdpSettings* settings = NULL; + rdpBitmapCache* bitmapCache = NULL; WINPR_ASSERT(context); @@ -397,10 +397,10 @@ void bitmap_cache_free(rdpBitmapCache* bitmapCache) bitmap_cache_save_persistent(bitmapCache); - UINT32 i; + UINT32 i = 0; for (i = 0; i < bitmapCache->maxCells; i++) { - UINT32 j; + UINT32 j = 0; BITMAP_V2_CELL* cell = &bitmapCache->cells[i]; if (!cell->entries) @@ -423,7 +423,7 @@ void bitmap_cache_free(rdpBitmapCache* bitmapCache) static void free_bitmap_data(BITMAP_DATA* data, size_t count) { - size_t x; + size_t x = 0; if (!data) return; @@ -436,7 +436,7 @@ static void free_bitmap_data(BITMAP_DATA* data, size_t count) static BITMAP_DATA* copy_bitmap_data(const BITMAP_DATA* data, size_t count) { - size_t x; + size_t x = 0; BITMAP_DATA* dst = (BITMAP_DATA*)calloc(count, sizeof(BITMAP_DATA)); if (!dst) diff --git a/libfreerdp/cache/brush.c b/libfreerdp/cache/brush.c index b66a3afd6..7463be35c 100644 --- a/libfreerdp/cache/brush.c +++ b/libfreerdp/cache/brush.c @@ -58,10 +58,10 @@ struct rdp_brush_cache static BOOL update_gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt) { - BYTE style; + BYTE style = 0; BOOL ret = TRUE; - rdpBrush* brush; - const rdpCache* cache; + rdpBrush* brush = NULL; + const rdpCache* cache = NULL; WINPR_ASSERT(context); WINPR_ASSERT(patblt); @@ -86,7 +86,7 @@ static BOOL update_gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt) static BOOL update_gdi_polygon_sc(rdpContext* context, const POLYGON_SC_ORDER* polygon_sc) { - rdpCache* cache; + rdpCache* cache = NULL; WINPR_ASSERT(context); cache = context->cache; WINPR_ASSERT(cache); @@ -96,9 +96,9 @@ static BOOL update_gdi_polygon_sc(rdpContext* context, const POLYGON_SC_ORDER* p static BOOL update_gdi_polygon_cb(rdpContext* context, POLYGON_CB_ORDER* polygon_cb) { - BYTE style; - rdpBrush* brush; - rdpCache* cache; + BYTE style = 0; + rdpBrush* brush = NULL; + rdpCache* cache = NULL; BOOL ret = TRUE; WINPR_ASSERT(context); @@ -124,9 +124,9 @@ static BOOL update_gdi_polygon_cb(rdpContext* context, POLYGON_CB_ORDER* polygon static BOOL update_gdi_cache_brush(rdpContext* context, const CACHE_BRUSH_ORDER* cacheBrush) { - UINT32 length; + UINT32 length = 0; void* data = NULL; - rdpCache* cache; + rdpCache* cache = NULL; WINPR_ASSERT(context); WINPR_ASSERT(cacheBrush); @@ -147,7 +147,7 @@ static BOOL update_gdi_cache_brush(rdpContext* context, const CACHE_BRUSH_ORDER* void* brush_cache_get(rdpBrushCache* brushCache, UINT32 index, UINT32* bpp) { - void* entry; + void* entry = NULL; if (!brushCache) return NULL; @@ -246,7 +246,7 @@ void brush_cache_register_callbacks(rdpUpdate* update) rdpBrushCache* brush_cache_new(rdpContext* context) { - rdpBrushCache* brushCache; + rdpBrushCache* brushCache = NULL; WINPR_ASSERT(context); @@ -279,7 +279,7 @@ fail: void brush_cache_free(rdpBrushCache* brushCache) { - size_t i; + size_t i = 0; if (brushCache) { @@ -311,7 +311,7 @@ void free_cache_brush_order(rdpContext* context, CACHE_BRUSH_ORDER* order) CACHE_BRUSH_ORDER* copy_cache_brush_order(rdpContext* context, const CACHE_BRUSH_ORDER* order) { - CACHE_BRUSH_ORDER* dst; + CACHE_BRUSH_ORDER* dst = NULL; WINPR_ASSERT(context); diff --git a/libfreerdp/cache/cache.c b/libfreerdp/cache/cache.c index 79da1d413..162d86100 100644 --- a/libfreerdp/cache/cache.c +++ b/libfreerdp/cache/cache.c @@ -27,7 +27,7 @@ rdpCache* cache_new(rdpContext* context) { - rdpCache* cache; + rdpCache* cache = NULL; WINPR_ASSERT(context); diff --git a/libfreerdp/cache/glyph.c b/libfreerdp/cache/glyph.c index ad3c4925a..bd672123d 100644 --- a/libfreerdp/cache/glyph.c +++ b/libfreerdp/cache/glyph.c @@ -77,10 +77,10 @@ static BOOL update_process_glyph(rdpContext* context, const BYTE* data, UINT32 c { INT32 sx = 0; INT32 sy = 0; - INT32 dx; - INT32 dy; - rdpGlyph* glyph; - rdpGlyphCache* glyph_cache; + INT32 dx = 0; + INT32 dy = 0; + rdpGlyph* glyph = NULL; + rdpGlyphCache* glyph_cache = NULL; if (!context || !data || !x || !y || !context->graphics || !context->cache || !context->cache->glyph) @@ -138,14 +138,14 @@ static BOOL update_process_glyph_fragments(rdpContext* context, const BYTE* data INT32 opX, INT32 opY, INT32 opWidth, INT32 opHeight, BOOL fOpRedundant) { - UINT32 n; - UINT32 id; - UINT32 size; + UINT32 n = 0; + UINT32 id = 0; + UINT32 size = 0; UINT32 index = 0; - const BYTE* fragments; - rdpGraphics* graphics; - rdpGlyphCache* glyph_cache; - rdpGlyph* glyph; + const BYTE* fragments = NULL; + rdpGraphics* graphics = NULL; + rdpGlyphCache* glyph_cache = NULL; + rdpGlyph* glyph = NULL; RDP_RECT bound; if (!context || !data || !context->graphics || !context->cache || !context->cache->glyph) @@ -317,12 +317,12 @@ static BOOL update_gdi_glyph_index(rdpContext* context, GLYPH_INDEX_ORDER* glyph static BOOL update_gdi_fast_index(rdpContext* context, const FAST_INDEX_ORDER* fastIndex) { - INT32 x; - INT32 y; - INT32 opLeft; - INT32 opTop; - INT32 opRight; - INT32 opBottom; + INT32 x = 0; + INT32 y = 0; + INT32 opLeft = 0; + INT32 opTop = 0; + INT32 opRight = 0; + INT32 opBottom = 0; INT32 opWidth = 0; INT32 opHeight = 0; INT32 bkWidth = 0; @@ -393,18 +393,18 @@ static BOOL update_gdi_fast_index(rdpContext* context, const FAST_INDEX_ORDER* f static BOOL update_gdi_fast_glyph(rdpContext* context, const FAST_GLYPH_ORDER* fastGlyph) { - INT32 x; - INT32 y; + INT32 x = 0; + INT32 y = 0; BYTE text_data[4] = { 0 }; - INT32 opLeft; - INT32 opTop; - INT32 opRight; - INT32 opBottom; + INT32 opLeft = 0; + INT32 opTop = 0; + INT32 opRight = 0; + INT32 opBottom = 0; INT32 opWidth = 0; INT32 opHeight = 0; INT32 bkWidth = 0; INT32 bkHeight = 0; - rdpCache* cache; + rdpCache* cache = NULL; if (!context || !fastGlyph || !context->cache) return FALSE; @@ -453,7 +453,7 @@ static BOOL update_gdi_fast_glyph(rdpContext* context, const FAST_GLYPH_ORDER* f if ((fastGlyph->cbData > 1) && (fastGlyph->glyphData.aj)) { /* got option font that needs to go into cache */ - rdpGlyph* glyph; + rdpGlyph* glyph = NULL; const GLYPH_DATA_V2* glyphData = &fastGlyph->glyphData; glyph = Glyph_Alloc(context, glyphData->x, glyphData->y, glyphData->cx, glyphData->cy, @@ -492,8 +492,8 @@ static BOOL update_gdi_fast_glyph(rdpContext* context, const FAST_GLYPH_ORDER* f static BOOL update_gdi_cache_glyph(rdpContext* context, const CACHE_GLYPH_ORDER* cacheGlyph) { - UINT32 i; - rdpCache* cache; + UINT32 i = 0; + rdpCache* cache = NULL; if (!context || !cacheGlyph || !context->cache) return FALSE; @@ -503,7 +503,7 @@ static BOOL update_gdi_cache_glyph(rdpContext* context, const CACHE_GLYPH_ORDER* for (i = 0; i < cacheGlyph->cGlyphs; i++) { const GLYPH_DATA* glyph_data = &cacheGlyph->glyphData[i]; - rdpGlyph* glyph; + rdpGlyph* glyph = NULL; if (!glyph_data) return FALSE; @@ -524,8 +524,8 @@ static BOOL update_gdi_cache_glyph(rdpContext* context, const CACHE_GLYPH_ORDER* static BOOL update_gdi_cache_glyph_v2(rdpContext* context, const CACHE_GLYPH_V2_ORDER* cacheGlyphV2) { - UINT32 i; - rdpCache* cache; + UINT32 i = 0; + rdpCache* cache = NULL; if (!context || !cacheGlyphV2 || !context->cache) return FALSE; @@ -535,7 +535,7 @@ static BOOL update_gdi_cache_glyph_v2(rdpContext* context, const CACHE_GLYPH_V2_ for (i = 0; i < cacheGlyphV2->cGlyphs; i++) { const GLYPH_DATA_V2* glyphData = &cacheGlyphV2->glyphData[i]; - rdpGlyph* glyph; + rdpGlyph* glyph = NULL; if (!glyphData) return FALSE; @@ -558,7 +558,7 @@ static BOOL update_gdi_cache_glyph_v2(rdpContext* context, const CACHE_GLYPH_V2_ rdpGlyph* glyph_cache_get(rdpGlyphCache* glyphCache, UINT32 id, UINT32 index) { - rdpGlyph* glyph; + rdpGlyph* glyph = NULL; WINPR_ASSERT(glyphCache); @@ -589,7 +589,7 @@ rdpGlyph* glyph_cache_get(rdpGlyphCache* glyphCache, UINT32 id, UINT32 index) BOOL glyph_cache_put(rdpGlyphCache* glyphCache, UINT32 id, UINT32 index, rdpGlyph* glyph) { - rdpGlyph* prevGlyph; + rdpGlyph* prevGlyph = NULL; WINPR_ASSERT(glyphCache); @@ -622,7 +622,7 @@ BOOL glyph_cache_put(rdpGlyphCache* glyphCache, UINT32 id, UINT32 index, rdpGlyp const void* glyph_cache_fragment_get(rdpGlyphCache* glyphCache, UINT32 index, UINT32* size) { - void* fragment; + void* fragment = NULL; WINPR_ASSERT(glyphCache); WINPR_ASSERT(glyphCache->fragCache.entries); @@ -647,8 +647,8 @@ const void* glyph_cache_fragment_get(rdpGlyphCache* glyphCache, UINT32 index, UI BOOL glyph_cache_fragment_put(rdpGlyphCache* glyphCache, UINT32 index, UINT32 size, const void* fragment) { - void* prevFragment; - void* copy; + void* prevFragment = NULL; + void* copy = NULL; WINPR_ASSERT(glyphCache); WINPR_ASSERT(glyphCache->fragCache.entries); @@ -693,9 +693,9 @@ void glyph_cache_register_callbacks(rdpUpdate* update) rdpGlyphCache* glyph_cache_new(rdpContext* context) { - size_t i; - rdpGlyphCache* glyphCache; - rdpSettings* settings; + size_t i = 0; + rdpGlyphCache* glyphCache = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(context); @@ -736,12 +736,12 @@ void glyph_cache_free(rdpGlyphCache* glyphCache) { if (glyphCache) { - size_t i; + size_t i = 0; GLYPH_CACHE* cache = glyphCache->glyphCache; for (i = 0; i < 10; i++) { - UINT32 j; + UINT32 j = 0; rdpGlyph** entries = cache[i].entries; if (!entries) @@ -774,8 +774,8 @@ void glyph_cache_free(rdpGlyphCache* glyphCache) CACHE_GLYPH_ORDER* copy_cache_glyph_order(rdpContext* context, const CACHE_GLYPH_ORDER* glyph) { - size_t x; - CACHE_GLYPH_ORDER* dst; + size_t x = 0; + CACHE_GLYPH_ORDER* dst = NULL; WINPR_ASSERT(context); @@ -826,7 +826,7 @@ void free_cache_glyph_order(rdpContext* context, CACHE_GLYPH_ORDER* glyph) { if (glyph) { - size_t x; + size_t x = 0; for (x = 0; x < ARRAYSIZE(glyph->glyphData); x++) free(glyph->glyphData[x].aj); @@ -840,8 +840,8 @@ void free_cache_glyph_order(rdpContext* context, CACHE_GLYPH_ORDER* glyph) CACHE_GLYPH_V2_ORDER* copy_cache_glyph_v2_order(rdpContext* context, const CACHE_GLYPH_V2_ORDER* glyph) { - size_t x; - CACHE_GLYPH_V2_ORDER* dst; + size_t x = 0; + CACHE_GLYPH_V2_ORDER* dst = NULL; WINPR_ASSERT(context); @@ -892,7 +892,7 @@ void free_cache_glyph_v2_order(rdpContext* context, CACHE_GLYPH_V2_ORDER* glyph) { if (glyph) { - size_t x; + size_t x = 0; for (x = 0; x < ARRAYSIZE(glyph->glyphData); x++) free(glyph->glyphData[x].aj); diff --git a/libfreerdp/cache/nine_grid.c b/libfreerdp/cache/nine_grid.c index b8b90cb55..392b546db 100644 --- a/libfreerdp/cache/nine_grid.c +++ b/libfreerdp/cache/nine_grid.c @@ -82,7 +82,7 @@ void nine_grid_cache_register_callbacks(rdpUpdate* update) void* nine_grid_cache_get(rdpNineGridCache* nine_grid, UINT32 index) { - void* entry; + void* entry = NULL; if (index >= nine_grid->maxEntries) { @@ -115,8 +115,8 @@ void nine_grid_cache_put(rdpNineGridCache* nine_grid, UINT32 index, void* entry) rdpNineGridCache* nine_grid_cache_new(rdpContext* context) { - rdpNineGridCache* nine_grid; - rdpSettings* settings; + rdpNineGridCache* nine_grid = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(context); @@ -158,7 +158,7 @@ void nine_grid_cache_free(rdpNineGridCache* nine_grid) { if (nine_grid->entries != NULL) { - size_t i; + size_t i = 0; for (i = 0; i < nine_grid->maxEntries; i++) free(nine_grid->entries[i].entry); diff --git a/libfreerdp/cache/offscreen.c b/libfreerdp/cache/offscreen.c index 256358381..499f5f596 100644 --- a/libfreerdp/cache/offscreen.c +++ b/libfreerdp/cache/offscreen.c @@ -52,10 +52,10 @@ static BOOL update_gdi_create_offscreen_bitmap(rdpContext* context, const CREATE_OFFSCREEN_BITMAP_ORDER* createOffscreenBitmap) { - UINT32 i; - UINT16 index; - rdpBitmap* bitmap; - rdpCache* cache; + UINT32 i = 0; + UINT16 index = 0; + rdpBitmap* bitmap = NULL; + rdpCache* cache = NULL; if (!context || !createOffscreenBitmap || !context->cache) return FALSE; @@ -92,8 +92,8 @@ update_gdi_create_offscreen_bitmap(rdpContext* context, static BOOL update_gdi_switch_surface(rdpContext* context, const SWITCH_SURFACE_ORDER* switchSurface) { - rdpCache* cache; - rdpBitmap* bitmap; + rdpCache* cache = NULL; + rdpBitmap* bitmap = NULL; if (!context || !context->cache || !switchSurface || !context->graphics) return FALSE; @@ -109,7 +109,7 @@ static BOOL update_gdi_switch_surface(rdpContext* context, } else { - rdpBitmap* bmp; + rdpBitmap* bmp = NULL; bmp = offscreen_cache_get(cache->offscreen, switchSurface->bitmapId); if (bmp == NULL) return FALSE; @@ -123,7 +123,7 @@ static BOOL update_gdi_switch_surface(rdpContext* context, rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreenCache, UINT32 index) { - rdpBitmap* bitmap; + rdpBitmap* bitmap = NULL; WINPR_ASSERT(offscreenCache); @@ -160,7 +160,7 @@ void offscreen_cache_put(rdpOffscreenCache* offscreenCache, UINT32 index, rdpBit void offscreen_cache_delete(rdpOffscreenCache* offscreenCache, UINT32 index) { - rdpBitmap* prevBitmap; + rdpBitmap* prevBitmap = NULL; WINPR_ASSERT(offscreenCache); @@ -189,8 +189,8 @@ void offscreen_cache_register_callbacks(rdpUpdate* update) rdpOffscreenCache* offscreen_cache_new(rdpContext* context) { - rdpOffscreenCache* offscreenCache; - rdpSettings* settings; + rdpOffscreenCache* offscreenCache = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(context); @@ -229,7 +229,7 @@ void offscreen_cache_free(rdpOffscreenCache* offscreenCache) { if (offscreenCache) { - size_t i; + size_t i = 0; if (offscreenCache->entries) { for (i = 0; i < offscreenCache->maxEntries; i++) diff --git a/libfreerdp/cache/palette.c b/libfreerdp/cache/palette.c index be35fd899..584e913f7 100644 --- a/libfreerdp/cache/palette.c +++ b/libfreerdp/cache/palette.c @@ -37,7 +37,7 @@ static void palette_cache_put(rdpPaletteCache* palette, UINT32 index, void* entr static BOOL update_gdi_cache_color_table(rdpContext* context, const CACHE_COLOR_TABLE_ORDER* cacheColorTable) { - UINT32* colorTable; + UINT32* colorTable = NULL; rdpCache* cache = context->cache; colorTable = (UINT32*)malloc(sizeof(UINT32) * 256); @@ -51,7 +51,7 @@ static BOOL update_gdi_cache_color_table(rdpContext* context, void* palette_cache_get(rdpPaletteCache* paletteCache, UINT32 index) { - void* entry; + void* entry = NULL; if (index >= paletteCache->maxEntries) { @@ -90,7 +90,7 @@ void palette_cache_register_callbacks(rdpUpdate* update) rdpPaletteCache* palette_cache_new(rdpContext* context) { - rdpPaletteCache* paletteCache; + rdpPaletteCache* paletteCache = NULL; WINPR_ASSERT(context); @@ -111,7 +111,7 @@ void palette_cache_free(rdpPaletteCache* paletteCache) { if (paletteCache) { - UINT32 i; + UINT32 i = 0; for (i = 0; i < paletteCache->maxEntries; i++) free(paletteCache->entries[i].entry); diff --git a/libfreerdp/cache/persistent.c b/libfreerdp/cache/persistent.c index 1230ab729..d1f123214 100644 --- a/libfreerdp/cache/persistent.c +++ b/libfreerdp/cache/persistent.c @@ -82,7 +82,7 @@ static int persistent_cache_read_entry_v2(rdpPersistentCache* persistent, static int persistent_cache_write_entry_v2(rdpPersistentCache* persistent, const PERSISTENT_CACHE_ENTRY* entry) { - int padding; + int padding = 0; PERSISTENT_CACHE_ENTRY_V2 entry2 = { 0 }; WINPR_ASSERT(persistent); @@ -244,7 +244,7 @@ static int persistent_cache_open_read(rdpPersistentCache* persistent) { BYTE sig[8] = { 0 }; int status = 1; - long offset; + long offset = 0; WINPR_ASSERT(persistent); persistent->fp = winpr_fopen(persistent->filename, "rb"); diff --git a/libfreerdp/cache/pointer.c b/libfreerdp/cache/pointer.c index 7171b2b61..e5187aa49 100644 --- a/libfreerdp/cache/pointer.c +++ b/libfreerdp/cache/pointer.c @@ -80,7 +80,7 @@ static BOOL update_pointer_position(rdpContext* context, static BOOL update_pointer_system(rdpContext* context, const POINTER_SYSTEM_UPDATE* pointer_system) { - rdpPointer* pointer; + rdpPointer* pointer = NULL; if (!context || !context->graphics || !context->graphics->Pointer_Prototype || !pointer_system) return FALSE; @@ -133,8 +133,8 @@ static BOOL upate_pointer_copy_andxor(rdpPointer* pointer, const BYTE* andMaskDa static BOOL update_pointer_color(rdpContext* context, const POINTER_COLOR_UPDATE* pointer_color) { - rdpPointer* pointer; - rdpCache* cache; + rdpPointer* pointer = NULL; + rdpCache* cache = NULL; WINPR_ASSERT(context); WINPR_ASSERT(pointer_color); @@ -172,8 +172,8 @@ out_fail: static BOOL update_pointer_large(rdpContext* context, const POINTER_LARGE_UPDATE* pointer_large) { - rdpPointer* pointer; - rdpCache* cache; + rdpPointer* pointer = NULL; + rdpCache* cache = NULL; WINPR_ASSERT(context); WINPR_ASSERT(pointer_large); @@ -244,8 +244,8 @@ out_fail: static BOOL update_pointer_cached(rdpContext* context, const POINTER_CACHED_UPDATE* pointer_cached) { - rdpPointer* pointer; - rdpCache* cache; + rdpPointer* pointer = NULL; + rdpCache* cache = NULL; WINPR_ASSERT(context); WINPR_ASSERT(pointer_cached); @@ -263,7 +263,7 @@ static BOOL update_pointer_cached(rdpContext* context, const POINTER_CACHED_UPDA rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, UINT32 index) { - rdpPointer* pointer; + rdpPointer* pointer = NULL; WINPR_ASSERT(pointer_cache); @@ -282,7 +282,7 @@ rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, UINT32 index) BOOL pointer_cache_put(rdpPointerCache* pointer_cache, UINT32 index, rdpPointer* pointer, BOOL colorCache) { - rdpPointer* prevPointer; + rdpPointer* prevPointer = NULL; const FreeRDP_Settings_Keys_UInt32 id = colorCache ? FreeRDP_ColorPointerCacheSize : FreeRDP_PointerCacheSize; @@ -316,7 +316,7 @@ BOOL pointer_cache_put(rdpPointerCache* pointer_cache, UINT32 index, rdpPointer* void pointer_cache_register_callbacks(rdpUpdate* update) { - rdpPointerUpdate* pointer; + rdpPointerUpdate* pointer = NULL; WINPR_ASSERT(update); WINPR_ASSERT(update->context); @@ -337,8 +337,8 @@ void pointer_cache_register_callbacks(rdpUpdate* update) rdpPointerCache* pointer_cache_new(rdpContext* context) { - rdpPointerCache* pointer_cache; - rdpSettings* settings; + rdpPointerCache* pointer_cache = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(context); @@ -373,8 +373,8 @@ void pointer_cache_free(rdpPointerCache* pointer_cache) { if (pointer_cache != NULL) { - UINT32 i; - rdpPointer* pointer; + UINT32 i = 0; + rdpPointer* pointer = NULL; if (pointer_cache->entries) { diff --git a/libfreerdp/codec/audio.c b/libfreerdp/codec/audio.c index f438aa97c..68475e464 100644 --- a/libfreerdp/codec/audio.c +++ b/libfreerdp/codec/audio.c @@ -49,7 +49,7 @@ UINT32 audio_format_compute_time_length(const AUDIO_FORMAT* format, size_t size) if (format->wFormatTag == WAVE_FORMAT_GSM610) { - UINT16 nSamplesPerBlock; + UINT16 nSamplesPerBlock = 0; if ((format->cbSize == 2) && (format->data)) { @@ -130,8 +130,8 @@ void audio_format_print(wLog* log, DWORD level, const AUDIO_FORMAT* format) void audio_formats_print(wLog* log, DWORD level, const AUDIO_FORMAT* formats, UINT16 count) { - UINT16 index; - const AUDIO_FORMAT* format; + UINT16 index = 0; + const AUDIO_FORMAT* format = NULL; if (formats) { @@ -288,7 +288,7 @@ void audio_format_free(AUDIO_FORMAT* format) void audio_formats_free(AUDIO_FORMAT* formats, size_t count) { - size_t index; + size_t index = 0; if (formats) { diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c index 6ef40aede..2372f1149 100644 --- a/libfreerdp/codec/bitmap.c +++ b/libfreerdp/codec/bitmap.c @@ -484,7 +484,7 @@ static SSIZE_T freerdp_bitmap_compress_24(const void* srcData, UINT32 width, UIN while ((line >= start) && (out_count < 32768)) { - UINT32 j; + UINT32 j = 0; size_t i = Stream_GetPosition(s) + count * 3U; if ((i - (color_count * 3) >= byte_limit) && (i - (bicolor_count * 3) >= byte_limit) && @@ -790,7 +790,7 @@ static SSIZE_T freerdp_bitmap_compress_16(const void* srcData, UINT32 width, UIN while ((line >= start) && (out_count < 32768)) { - UINT32 j; + UINT32 j = 0; size_t i = Stream_GetPosition(s) + count * 2; if ((i - (color_count * 2) >= byte_limit) && (i - (bicolor_count * 2) >= byte_limit) && diff --git a/libfreerdp/codec/bulk.c b/libfreerdp/codec/bulk.c index a63375e1c..1f5beb3e1 100644 --- a/libfreerdp/codec/bulk.c +++ b/libfreerdp/codec/bulk.c @@ -17,6 +17,7 @@ * limitations under the License. */ +#include #include #include @@ -74,7 +75,7 @@ static INLINE const char* bulk_get_compression_flags_string(UINT32 flags) static UINT32 bulk_compression_level(rdpBulk* bulk) { - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(bulk); WINPR_ASSERT(bulk->context); settings = bulk->context->settings; @@ -148,12 +149,12 @@ static INLINE int bulk_compress_validate(rdpBulk* bulk, const BYTE* pSrcData, UI int bulk_decompress(rdpBulk* bulk, const BYTE* pSrcData, UINT32 SrcSize, const BYTE** ppDstData, UINT32* pDstSize, UINT32 flags) { - UINT32 type; + UINT32 type = 0; int status = -1; - rdpMetrics* metrics; - UINT32 CompressedBytes; - UINT32 UncompressedBytes; - double CompressionRatio; + rdpMetrics* metrics = NULL; + UINT32 CompressedBytes = 0; + UINT32 UncompressedBytes = 0; + double CompressionRatio = NAN; WINPR_ASSERT(bulk); WINPR_ASSERT(bulk->context); @@ -242,10 +243,10 @@ int bulk_compress(rdpBulk* bulk, const BYTE* pSrcData, UINT32 SrcSize, const BYT UINT32* pDstSize, UINT32* pFlags) { int status = -1; - rdpMetrics* metrics; - UINT32 CompressedBytes; - UINT32 UncompressedBytes; - double CompressionRatio; + rdpMetrics* metrics = NULL; + UINT32 CompressedBytes = 0; + UINT32 UncompressedBytes = 0; + double CompressionRatio = NAN; WINPR_ASSERT(bulk); WINPR_ASSERT(bulk->context); @@ -337,7 +338,7 @@ void bulk_reset(rdpBulk* bulk) rdpBulk* bulk_new(rdpContext* context) { - rdpBulk* bulk; + rdpBulk* bulk = NULL; WINPR_ASSERT(context); bulk = (rdpBulk*)calloc(1, sizeof(rdpBulk)); diff --git a/libfreerdp/codec/clear.c b/libfreerdp/codec/clear.c index 1ab56317d..4052abf6b 100644 --- a/libfreerdp/codec/clear.c +++ b/libfreerdp/codec/clear.c @@ -132,7 +132,7 @@ static BOOL clear_decompress_nscodec(NSC_CONTEXT* nsc, UINT32 width, UINT32 heig UINT32 bitmapDataByteCount, BYTE* pDstData, UINT32 DstFormat, UINT32 nDstStep, UINT32 nXDstRel, UINT32 nYDstRel) { - BOOL rc; + BOOL rc = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, bitmapDataByteCount)) return FALSE; @@ -151,16 +151,16 @@ static BOOL clear_decompress_subcode_rlex(wStream* s, UINT32 bitmapDataByteCount { UINT32 x = 0; UINT32 y = 0; - UINT32 i; - UINT32 pixelCount; - UINT32 bitmapDataOffset; - size_t pixelIndex; - UINT32 numBits; - BYTE startIndex; - BYTE stopIndex; - BYTE suiteIndex; - BYTE suiteDepth; - BYTE paletteCount; + UINT32 i = 0; + UINT32 pixelCount = 0; + UINT32 bitmapDataOffset = 0; + size_t pixelIndex = 0; + UINT32 numBits = 0; + BYTE startIndex = 0; + BYTE stopIndex = 0; + BYTE suiteIndex = 0; + BYTE suiteDepth = 0; + BYTE paletteCount = 0; UINT32 palette[128] = { 0 }; if (!Stream_CheckAndLogRequiredLength(TAG, s, bitmapDataByteCount)) @@ -182,9 +182,9 @@ static BOOL clear_decompress_subcode_rlex(wStream* s, UINT32 bitmapDataByteCount for (i = 0; i < paletteCount; i++) { - BYTE r; - BYTE g; - BYTE b; + BYTE r = 0; + BYTE g = 0; + BYTE b = 0; Stream_Read_UINT8(s, b); Stream_Read_UINT8(s, g); Stream_Read_UINT8(s, r); @@ -325,7 +325,7 @@ static BOOL clear_decompress_subcode_rlex(wStream* s, UINT32 bitmapDataByteCount static BOOL clear_resize_buffer(CLEAR_CONTEXT* clear, UINT32 width, UINT32 height) { - UINT32 size; + UINT32 size = 0; if (!clear) return FALSE; @@ -356,12 +356,12 @@ static BOOL clear_decompress_residual_data(CLEAR_CONTEXT* clear, wStream* s, UINT32 nXDst, UINT32 nYDst, UINT32 nDstWidth, UINT32 nDstHeight, const gdiPalette* palette) { - UINT32 i; - UINT32 nSrcStep; - UINT32 suboffset; - BYTE* dstBuffer; - UINT32 pixelIndex; - UINT32 pixelCount; + UINT32 i = 0; + UINT32 nSrcStep = 0; + UINT32 suboffset = 0; + BYTE* dstBuffer = NULL; + UINT32 pixelIndex = 0; + UINT32 pixelCount = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, residualByteCount)) return FALSE; @@ -377,11 +377,11 @@ static BOOL clear_decompress_residual_data(CLEAR_CONTEXT* clear, wStream* s, while (suboffset < residualByteCount) { - BYTE r; - BYTE g; - BYTE b; - UINT32 runLengthFactor; - UINT32 color; + BYTE r = 0; + BYTE g = 0; + BYTE b = 0; + UINT32 runLengthFactor = 0; + UINT32 color = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) return FALSE; @@ -448,13 +448,13 @@ static BOOL clear_decompress_subcodecs_data(CLEAR_CONTEXT* clear, wStream* s, UINT32 nXDst, UINT32 nYDst, UINT32 nDstWidth, UINT32 nDstHeight, const gdiPalette* palette) { - UINT16 xStart; - UINT16 yStart; - UINT16 width; - UINT16 height; - UINT32 bitmapDataByteCount; - BYTE subcodecId; - UINT32 suboffset; + UINT16 xStart = 0; + UINT16 yStart = 0; + UINT16 width = 0; + UINT16 height = 0; + UINT32 bitmapDataByteCount = 0; + BYTE subcodecId = 0; + UINT32 suboffset = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, subcodecByteCount)) return FALSE; @@ -463,8 +463,8 @@ static BOOL clear_decompress_subcodecs_data(CLEAR_CONTEXT* clear, wStream* s, while (suboffset < subcodecByteCount) { - UINT32 nXDstRel; - UINT32 nYDstRel; + UINT32 nXDstRel = 0; + UINT32 nYDstRel = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 13)) return FALSE; @@ -592,19 +592,19 @@ static BOOL clear_decompress_bands_data(CLEAR_CONTEXT* clear, wStream* s, UINT32 while (suboffset < bandsByteCount) { - BYTE cr; - BYTE cg; - BYTE cb; - UINT16 xStart; - UINT16 xEnd; - UINT16 yStart; - UINT16 yEnd; - UINT32 colorBkg; - UINT16 vBarHeader; + BYTE cr = 0; + BYTE cg = 0; + BYTE cb = 0; + UINT16 xStart = 0; + UINT16 xEnd = 0; + UINT16 yStart = 0; + UINT16 yEnd = 0; + UINT32 colorBkg = 0; + UINT16 vBarHeader = 0; UINT16 vBarYOn = 0; - UINT16 vBarYOff; - UINT32 vBarCount; - UINT32 vBarPixelCount; + UINT16 vBarYOff = 0; + UINT32 vBarCount = 0; + UINT32 vBarPixelCount = 0; UINT32 vBarShortPixelCount = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 11)) @@ -636,11 +636,11 @@ static BOOL clear_decompress_bands_data(CLEAR_CONTEXT* clear, wStream* s, UINT32 for (UINT32 i = 0; i < vBarCount; i++) { - UINT32 vBarHeight; + UINT32 vBarHeight = 0; CLEAR_VBAR_ENTRY* vBarEntry = NULL; CLEAR_VBAR_ENTRY* vBarShortEntry = NULL; BOOL vBarUpdate = FALSE; - const BYTE* cpSrcPixel; + const BYTE* cpSrcPixel = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, s, 2)) return FALSE; @@ -756,9 +756,9 @@ static BOOL clear_decompress_bands_data(CLEAR_CONTEXT* clear, wStream* s, UINT32 if (vBarUpdate) { - UINT32 x; + UINT32 x = 0; BYTE* pSrcPixel = NULL; - BYTE* dstBuffer; + BYTE* dstBuffer = NULL; if (clear->VBarStorageCursor >= CLEARCODEC_VBAR_SIZE) { @@ -807,7 +807,7 @@ static BOOL clear_decompress_bands_data(CLEAR_CONTEXT* clear, wStream* s, UINT32 for (x = 0; x < count; x++) { - UINT32 color; + UINT32 color = 0; color = FreeRDPReadColor(&pSrcPixel[x * FreeRDPGetBytesPerPixel(clear->format)], clear->format); @@ -919,9 +919,9 @@ static BOOL clear_decompress_glyph_data(CLEAR_CONTEXT* clear, wStream* s, UINT32 if (glyphFlags & CLEARCODEC_FLAG_GLYPH_HIT) { - UINT32 nSrcStep; + UINT32 nSrcStep = 0; CLEAR_GLYPH_ENTRY* glyphEntry = &(clear->GlyphCache[glyphIndex]); - BYTE* glyphData; + BYTE* glyphData = NULL; if (!glyphEntry) { @@ -1002,13 +1002,13 @@ INT32 clear_decompress(CLEAR_CONTEXT* clear, const BYTE* pSrcData, UINT32 SrcSiz const gdiPalette* palette) { INT32 rc = -1; - BYTE seqNumber; - BYTE glyphFlags; - UINT32 residualByteCount; - UINT32 bandsByteCount; - UINT32 subcodecByteCount; + BYTE seqNumber = 0; + BYTE glyphFlags = 0; + UINT32 residualByteCount = 0; + UINT32 bandsByteCount = 0; + UINT32 subcodecByteCount = 0; wStream sbuffer = { 0 }; - wStream* s; + wStream* s = NULL; BYTE* glyphData = NULL; if (!pDstData) diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c index 071797ce0..24e8273d9 100644 --- a/libfreerdp/codec/color.c +++ b/libfreerdp/codec/color.c @@ -43,12 +43,12 @@ BYTE* freerdp_glyph_convert(UINT32 width, UINT32 height, const BYTE* data) { - UINT32 x; - UINT32 y; - const BYTE* srcp; - BYTE* dstp; - BYTE* dstData; - UINT32 scanline; + UINT32 x = 0; + UINT32 y = 0; + const BYTE* srcp = NULL; + BYTE* dstp = NULL; + BYTE* dstData = NULL; + UINT32 scanline = 0; /* * converts a 1-bit-per-pixel glyph to a one-byte-per-pixel glyph: * this approach uses a little more memory, but provides faster @@ -88,10 +88,10 @@ BOOL freerdp_image_copy_from_monochrome(BYTE* WINPR_RESTRICT pDstData, UINT32 Ds UINT32 backColor, UINT32 foreColor, const gdiPalette* WINPR_RESTRICT palette) { - UINT32 x; - UINT32 y; - BOOL vFlip; - UINT32 monoStep; + UINT32 x = 0; + UINT32 y = 0; + BOOL vFlip = 0; + UINT32 monoStep = 0; const UINT32 dstBytesPerPixel = FreeRDPGetBytesPerPixel(DstFormat); if (!pDstData || !pSrcData || !palette) @@ -105,7 +105,7 @@ BOOL freerdp_image_copy_from_monochrome(BYTE* WINPR_RESTRICT pDstData, UINT32 Ds for (y = 0; y < nHeight; y++) { - const BYTE* monoBits; + const BYTE* monoBits = NULL; BYTE* pDstLine = &pDstData[((nYDst + y) * nDstStep)]; UINT32 monoBit = 0x80; @@ -161,7 +161,7 @@ static INLINE UINT32 freerdp_image_inverted_pointer_color(UINT32 x, UINT32 y, UI static void fill_gdi_palette_for_icon(const BYTE* colorTable, UINT16 cbColorTable, gdiPalette* palette) { - UINT16 i; + UINT16 i = 0; WINPR_ASSERT(palette); @@ -200,7 +200,7 @@ BOOL freerdp_image_copy_from_icon_data(BYTE* WINPR_RESTRICT pDstData, UINT32 Dst UINT16 cbBitsMask, const BYTE* WINPR_RESTRICT colorTable, UINT16 cbColorTable, UINT32 bpp) { - DWORD format; + DWORD format = 0; gdiPalette palette; if (!pDstData || !bitsColor) @@ -258,14 +258,14 @@ BOOL freerdp_image_copy_from_icon_data(BYTE* WINPR_RESTRICT pDstData, UINT32 Dst /* apply alpha mask */ if (FreeRDPColorHasAlpha(DstFormat) && cbBitsMask) { - BYTE nextBit; - const BYTE* maskByte; - UINT32 x; - UINT32 y; - UINT32 stride; - BYTE r; - BYTE g; - BYTE b; + BYTE nextBit = 0; + const BYTE* maskByte = NULL; + UINT32 x = 0; + UINT32 y = 0; + UINT32 stride = 0; + BYTE r = 0; + BYTE g = 0; + BYTE b = 0; BYTE* dstBuf = pDstData; UINT32 dstBpp = FreeRDPGetBytesPerPixel(DstFormat); @@ -283,7 +283,7 @@ BOOL freerdp_image_copy_from_icon_data(BYTE* WINPR_RESTRICT pDstData, UINT32 Dst for (x = 0; x < nWidth; x++) { - UINT32 color; + UINT32 color = 0; BYTE alpha = (*maskByte & nextBit) ? 0x00 : 0xFF; /* read color back, add alpha and write it back */ @@ -311,15 +311,15 @@ static BOOL freerdp_image_copy_from_pointer_data_1bpp( UINT32 nWidth, UINT32 nHeight, const BYTE* WINPR_RESTRICT xorMask, UINT32 xorMaskLength, const BYTE* WINPR_RESTRICT andMask, UINT32 andMaskLength, UINT32 xorBpp) { - UINT32 x; - UINT32 y; - BOOL vFlip; - UINT32 xorStep; - UINT32 andStep; - UINT32 xorBit; - UINT32 andBit; - UINT32 xorPixel; - UINT32 andPixel; + UINT32 x = 0; + UINT32 y = 0; + BOOL vFlip = 0; + UINT32 xorStep = 0; + UINT32 andStep = 0; + UINT32 xorBit = 0; + UINT32 andBit = 0; + UINT32 xorPixel = 0; + UINT32 andPixel = 0; vFlip = (xorBpp == 1) ? FALSE : TRUE; andStep = (nWidth + 7) / 8; @@ -341,8 +341,8 @@ static BOOL freerdp_image_copy_from_pointer_data_1bpp( for (y = 0; y < nHeight; y++) { - const BYTE* andBits; - const BYTE* xorBits; + const BYTE* andBits = NULL; + const BYTE* xorBits = NULL; BYTE* pDstPixel = &pDstData[((nYDst + y) * nDstStep) + (nXDst * FreeRDPGetBytesPerPixel(DstFormat))]; xorBit = andBit = 0x80; @@ -400,16 +400,16 @@ static BOOL freerdp_image_copy_from_pointer_data_xbpp( const BYTE* WINPR_RESTRICT andMask, UINT32 andMaskLength, UINT32 xorBpp, const gdiPalette* palette) { - UINT32 x; - UINT32 y; - BOOL vFlip; - UINT32 xorStep; - UINT32 andStep; - UINT32 andBit; - UINT32 xorPixel; - UINT32 andPixel; - UINT32 dstBitsPerPixel; - UINT32 xorBytesPerPixel; + UINT32 x = 0; + UINT32 y = 0; + BOOL vFlip = 0; + UINT32 xorStep = 0; + UINT32 andStep = 0; + UINT32 andBit = 0; + UINT32 xorPixel = 0; + UINT32 andPixel = 0; + UINT32 dstBitsPerPixel = 0; + UINT32 xorBytesPerPixel = 0; dstBitsPerPixel = FreeRDPGetBitsPerPixel(DstFormat); vFlip = (xorBpp == 1) ? FALSE : TRUE; @@ -441,7 +441,7 @@ static BOOL freerdp_image_copy_from_pointer_data_xbpp( for (y = 0; y < nHeight; y++) { - const BYTE* xorBits; + const BYTE* xorBits = NULL; const BYTE* andBits = NULL; BYTE* pDstPixel = &pDstData[((nYDst + y) * nDstStep) + (nXDst * FreeRDPGetBytesPerPixel(DstFormat))]; @@ -464,8 +464,8 @@ static BOOL freerdp_image_copy_from_pointer_data_xbpp( for (x = 0; x < nWidth; x++) { - UINT32 pixelFormat; - UINT32 color; + UINT32 pixelFormat = 0; + UINT32 color = 0; if (xorBpp == 32) { @@ -535,8 +535,8 @@ BOOL freerdp_image_copy_from_pointer_data(BYTE* WINPR_RESTRICT pDstData, UINT32 const BYTE* WINPR_RESTRICT andMask, UINT32 andMaskLength, UINT32 xorBpp, const gdiPalette* palette) { - UINT32 dstBitsPerPixel; - UINT32 dstBytesPerPixel; + UINT32 dstBitsPerPixel = 0; + UINT32 dstBytesPerPixel = 0; dstBitsPerPixel = FreeRDPGetBitsPerPixel(DstFormat); dstBytesPerPixel = FreeRDPGetBytesPerPixel(DstFormat); @@ -769,7 +769,7 @@ static BOOL freerdp_image_copy_overlap(BYTE* pDstData, DWORD DstFormat, UINT32 n } else if (FreeRDPAreColorFormatsEqualNoAlpha(SrcFormat, DstFormat)) { - INT32 y; + INT32 y = 0; /* Copy down */ if (nYDst < nYSrc) @@ -888,8 +888,8 @@ BOOL freerdp_image_fill(BYTE* WINPR_RESTRICT pDstData, DWORD DstFormat, UINT32 n if ((nWidth == 0) || (nHeight == 0)) return TRUE; const UINT32 bpp = FreeRDPGetBytesPerPixel(DstFormat); - BYTE* WINPR_RESTRICT pFirstDstLine; - BYTE* WINPR_RESTRICT pFirstDstLineXOffset; + BYTE* WINPR_RESTRICT pFirstDstLine = NULL; + BYTE* WINPR_RESTRICT pFirstDstLineXOffset = NULL; if (nDstStep == 0) nDstStep = (nXDst + nWidth) * FreeRDPGetBytesPerPixel(DstFormat); @@ -963,8 +963,8 @@ BOOL freerdp_image_scale(BYTE* WINPR_RESTRICT pDstData, DWORD DstFormat, UINT32 else #if defined(WITH_SWSCALE) { - int res; - struct SwsContext* resize; + int res = 0; + struct SwsContext* resize = NULL; int srcFormat = av_format_for_buffer(SrcFormat); int dstFormat = av_format_for_buffer(DstFormat); const int srcStep[1] = { (int)nSrcStep }; @@ -1566,7 +1566,7 @@ BOOL FreeRDPWriteColor(BYTE* WINPR_RESTRICT dst, UINT32 format, UINT32 color) UINT32 FreeRDPReadColor(const BYTE* WINPR_RESTRICT src, UINT32 format) { - UINT32 color; + UINT32 color = 0; switch (FreeRDPGetBitsPerPixel(format)) { @@ -1612,7 +1612,7 @@ UINT32 FreeRDPGetColor(UINT32 format, BYTE r, BYTE g, BYTE b, BYTE a) UINT32 _g = g; UINT32 _b = b; UINT32 _a = a; - UINT32 t; + UINT32 t = 0; switch (format) { diff --git a/libfreerdp/codec/dsp_ffmpeg.c b/libfreerdp/codec/dsp_ffmpeg.c index 39efd764f..98d78a63e 100644 --- a/libfreerdp/codec/dsp_ffmpeg.c +++ b/libfreerdp/codec/dsp_ffmpeg.c @@ -225,7 +225,7 @@ static void ffmpeg_close_context(FREERDP_DSP_CONTEXT* context) static BOOL ffmpeg_open_context(FREERDP_DSP_CONTEXT* context) { - int ret; + int ret = 0; if (!context || context->isOpen) return FALSE; @@ -372,7 +372,7 @@ fail: #if defined(SWRESAMPLE_FOUND) static BOOL ffmpeg_resample_frame(SwrContext* context, AVFrame* in, AVFrame* out) { - int ret; + int ret = 0; if (!swr_is_initialized(context)) { @@ -500,8 +500,8 @@ static BOOL ffmpeg_encode_frame(AVCodecContext* context, AVFrame* in, AVPacket* static BOOL ffmpeg_fill_frame(AVFrame* frame, const AUDIO_FORMAT* inputFormat, const BYTE* data, size_t size) { - int ret; - int bpp; + int ret = 0; + int bpp = 0; #if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(57, 28, 100) frame->channels = inputFormat->nChannels; frame->channel_layout = av_get_default_channel_layout(frame->channels); @@ -532,7 +532,7 @@ static BOOL ffmpeg_decode(AVCodecContext* dec_ctx, AVPacket* pkt, AVFrame* frame AVAudioResampleContext* resampleContext, AVFrame* resampled, wStream* out) #endif { - int ret; + int ret = 0; /* send the packet with the compressed data to the decoder */ ret = avcodec_send_packet(dec_ctx, pkt); @@ -626,7 +626,7 @@ BOOL freerdp_dsp_ffmpeg_supports_format(const AUDIO_FORMAT* format, BOOL encode) FREERDP_DSP_CONTEXT* freerdp_dsp_ffmpeg_context_new(BOOL encode) { - FREERDP_DSP_CONTEXT* context; + FREERDP_DSP_CONTEXT* context = NULL; #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100) avcodec_register_all(); #endif @@ -673,10 +673,10 @@ static BOOL freerdp_dsp_channel_mix(FREERDP_DSP_CONTEXT* context, const BYTE* sr const AUDIO_FORMAT* srcFormat, const BYTE** data, size_t* length, AUDIO_FORMAT* dstFormat) { - UINT32 bpp; - size_t samples; - size_t x; - size_t y; + UINT32 bpp = 0; + size_t samples = 0; + size_t x = 0; + size_t y = 0; if (!context || !data || !length || !dstFormat) return FALSE; @@ -761,7 +761,7 @@ static BOOL freerdp_dsp_channel_mix(FREERDP_DSP_CONTEXT* context, const BYTE* sr BOOL freerdp_dsp_ffmpeg_encode(FREERDP_DSP_CONTEXT* context, const AUDIO_FORMAT* format, const BYTE* data, size_t length, wStream* out) { - int rc; + int rc = 0; AUDIO_FORMAT fmt = { 0 }; if (!context || !format || !data || !out || !context->encoder) diff --git a/libfreerdp/codec/h264.c b/libfreerdp/codec/h264.c index a9d83cd1e..b72c34c2f 100644 --- a/libfreerdp/codec/h264.c +++ b/libfreerdp/codec/h264.c @@ -95,7 +95,7 @@ INT32 avc420_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, UINT32 SrcSize DWORD DstFormat, UINT32 nDstStep, UINT32 nDstWidth, UINT32 nDstHeight, const RECTANGLE_16* regionRects, UINT32 numRegionRects) { - int status; + int status = 0; const BYTE* pYUVData[3]; if (!h264 || h264->Compressor) @@ -122,7 +122,7 @@ INT32 avc420_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, UINT32 SrcSize static BOOL allocate_h264_metablock(UINT32 QP, RECTANGLE_16* rectangles, RDPGFX_H264_METABLOCK* meta, size_t count) { - size_t x; + size_t x = 0; /* [MS-RDPEGFX] 2.2.4.4.2 RDPGFX_AVC420_QUANT_QUALITY */ if (!meta || (QP > UINT8_MAX)) @@ -155,8 +155,8 @@ static BOOL allocate_h264_metablock(UINT32 QP, RECTANGLE_16* rectangles, static INLINE BOOL diff_tile(const RECTANGLE_16* regionRect, BYTE* pYUVData[3], BYTE* pOldYUVData[3], UINT32 const iStride[3]) { - size_t size; - size_t y; + size_t size = 0; + size_t y = 0; if (!regionRect || !pYUVData || !pOldYUVData || !iStride) return FALSE; size = regionRect->right - regionRect->left; @@ -191,9 +191,9 @@ static BOOL detect_changes(BOOL firstFrameDone, const UINT32 QP, const RECTANGLE RDPGFX_H264_METABLOCK* meta) { size_t count = 0; - size_t wc; - size_t hc; - RECTANGLE_16* rectangles; + size_t wc = 0; + size_t hc = 0; + RECTANGLE_16* rectangles = NULL; if (!regionRect || !pYUVData || !pOldYUVData || !iStride || !meta) return FALSE; @@ -210,8 +210,8 @@ static BOOL detect_changes(BOOL firstFrameDone, const UINT32 QP, const RECTANGLE } else { - size_t x; - size_t y; + size_t x = 0; + size_t y = 0; for (y = regionRect->top; y < regionRect->bottom; y += 64) { for (x = regionRect->left; x < regionRect->right; x += 64) @@ -237,7 +237,7 @@ INT32 avc420_compress(H264_CONTEXT* h264, const BYTE* pSrcData, DWORD SrcFormat, UINT32 nSrcWidth, UINT32 nSrcHeight, const RECTANGLE_16* regionRect, BYTE** ppDstData, UINT32* pDstSize, RDPGFX_H264_METABLOCK* meta) { - size_t x; + size_t x = 0; INT32 rc = -1; BYTE* pYUVData[3] = { 0 }; const BYTE* pcYUVData[3] = { 0 }; @@ -304,12 +304,12 @@ INT32 avc444_compress(H264_CONTEXT* h264, const BYTE* pSrcData, DWORD SrcFormat, RDPGFX_H264_METABLOCK* auxMeta) { int rc = -1; - BYTE* coded; - UINT32 codedSize; - BYTE** pYUV444Data; - BYTE** pOldYUV444Data; - BYTE** pYUVData; - BYTE** pOldYUVData; + BYTE* coded = NULL; + UINT32 codedSize = 0; + BYTE** pYUV444Data = NULL; + BYTE** pOldYUV444Data = NULL; + BYTE** pYUVData = NULL; + BYTE** pOldYUVData = NULL; if (!h264 || !h264->Compressor) return -1; @@ -630,7 +630,7 @@ static BOOL CALLBACK h264_register_subsystems(PINIT_ONCE once, PVOID param, PVOI static BOOL h264_context_init(H264_CONTEXT* h264) { - int i; + int i = 0; if (!h264) return FALSE; @@ -706,7 +706,7 @@ void h264_context_free(H264_CONTEXT* h264) { if (h264) { - size_t x; + size_t x = 0; if (h264->subsystem) h264->subsystem->Uninit(h264); diff --git a/libfreerdp/codec/h264_ffmpeg.c b/libfreerdp/codec/h264_ffmpeg.c index 896a33301..33aa6b0cc 100644 --- a/libfreerdp/codec/h264_ffmpeg.c +++ b/libfreerdp/codec/h264_ffmpeg.c @@ -93,7 +93,7 @@ typedef struct static void libavcodec_destroy_encoder(H264_CONTEXT* h264) { - H264_CONTEXT_LIBAVCODEC* sys; + H264_CONTEXT_LIBAVCODEC* sys = NULL; if (!h264 || !h264->subsystem) return; @@ -117,7 +117,7 @@ static void libavcodec_destroy_encoder(H264_CONTEXT* h264) static BOOL libavcodec_create_encoder(H264_CONTEXT* h264) { BOOL recreate = FALSE; - H264_CONTEXT_LIBAVCODEC* sys; + H264_CONTEXT_LIBAVCODEC* sys = NULL; if (!h264 || !h264->subsystem) return FALSE; @@ -194,7 +194,7 @@ static int libavcodec_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, UINT3 BYTE* pv; } cnv; int rc = -1; - int status; + int status = 0; int gotFrame = 0; AVPacket* packet = NULL; @@ -333,7 +333,7 @@ static int libavcodec_compress(H264_CONTEXT* h264, const BYTE** pSrcYuv, const U uint8_t* pv; } cnv; int rc = -1; - int status; + int status = 0; int gotFrame = 0; WINPR_ASSERT(h264); @@ -533,7 +533,7 @@ static enum AVPixelFormat libavcodec_get_format(struct AVCodecContext* ctx, H264_CONTEXT_LIBAVCODEC* sys = (H264_CONTEXT_LIBAVCODEC*)h264->pSystemData; WINPR_ASSERT(sys); - const enum AVPixelFormat* p; + const enum AVPixelFormat* p = NULL; for (p = fmts; *p != AV_PIX_FMT_NONE; p++) { @@ -581,7 +581,7 @@ static enum AVPixelFormat libavcodec_get_format(struct AVCodecContext* ctx, static BOOL libavcodec_init(H264_CONTEXT* h264) { - H264_CONTEXT_LIBAVCODEC* sys; + H264_CONTEXT_LIBAVCODEC* sys = NULL; WINPR_ASSERT(h264); sys = (H264_CONTEXT_LIBAVCODEC*)calloc(1, sizeof(H264_CONTEXT_LIBAVCODEC)); diff --git a/libfreerdp/codec/h264_openh264.c b/libfreerdp/codec/h264_openh264.c index 3c199da0d..470974241 100644 --- a/libfreerdp/codec/h264_openh264.c +++ b/libfreerdp/codec/h264_openh264.c @@ -76,12 +76,12 @@ static void openh264_trace_callback(H264_CONTEXT* h264, int level, const char* m static int openh264_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, UINT32 SrcSize) { - DECODING_STATE state; + DECODING_STATE state = dsInvalidArgument; SBufferInfo sBufferInfo = { 0 }; - SSysMEMBuffer* pSystemBuffer; - H264_CONTEXT_OPENH264* sys; - UINT32* iStride; - BYTE** pYUVData; + SSysMEMBuffer* pSystemBuffer = NULL; + H264_CONTEXT_OPENH264* sys = NULL; + UINT32* iStride = NULL; + BYTE** pYUVData = NULL; WINPR_ASSERT(h264); WINPR_ASSERT(pSrcData || (SrcSize == 0)); @@ -182,13 +182,13 @@ static int openh264_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, UINT32 static int openh264_compress(H264_CONTEXT* h264, const BYTE** pYUVData, const UINT32* iStride, BYTE** ppDstData, UINT32* pDstSize) { - int i; - int j; - int status; + int i = 0; + int j = 0; + int status = 0; SFrameBSInfo info = { 0 }; SSourcePicture pic = { 0 }; - H264_CONTEXT_OPENH264* sys; + H264_CONTEXT_OPENH264* sys = NULL; WINPR_ASSERT(h264); WINPR_ASSERT(pYUVData); @@ -388,8 +388,8 @@ static int openh264_compress(H264_CONTEXT* h264, const BYTE** pYUVData, const UI static void openh264_uninit(H264_CONTEXT* h264) { - UINT32 x; - H264_CONTEXT_OPENH264* sysContexts; + UINT32 x = 0; + H264_CONTEXT_OPENH264* sysContexts = NULL; WINPR_ASSERT(h264); @@ -492,9 +492,9 @@ static BOOL openh264_init(H264_CONTEXT* h264) BOOL success = FALSE; size_t i; #endif - UINT32 x; - long status; - H264_CONTEXT_OPENH264* sysContexts; + UINT32 x = 0; + long status = 0; + H264_CONTEXT_OPENH264* sysContexts = NULL; static int traceLevel = WELS_LOG_DEBUG; #if (OPENH264_MAJOR == 1) && (OPENH264_MINOR <= 5) static EVideoFormatType videoFormat = videoFormatI420; diff --git a/libfreerdp/codec/interleaved.c b/libfreerdp/codec/interleaved.c index 1248ef60d..3f39ea3c6 100644 --- a/libfreerdp/codec/interleaved.c +++ b/libfreerdp/codec/interleaved.c @@ -204,7 +204,7 @@ static INLINE UINT32 ExtractCodeId(BYTE bOrderHdr) */ static UINT ExtractRunLengthRegularFgBg(const BYTE* pbOrderHdr, const BYTE* pbEnd, UINT32* advance) { - UINT runLength; + UINT runLength = 0; WINPR_ASSERT(pbOrderHdr); WINPR_ASSERT(pbEnd); @@ -229,7 +229,7 @@ static UINT ExtractRunLengthRegularFgBg(const BYTE* pbOrderHdr, const BYTE* pbEn static UINT ExtractRunLengthLiteFgBg(const BYTE* pbOrderHdr, const BYTE* pbEnd, UINT32* advance) { - UINT runLength; + UINT runLength = 0; WINPR_ASSERT(pbOrderHdr); WINPR_ASSERT(pbEnd); @@ -254,7 +254,7 @@ static UINT ExtractRunLengthLiteFgBg(const BYTE* pbOrderHdr, const BYTE* pbEnd, static UINT ExtractRunLengthRegular(const BYTE* pbOrderHdr, const BYTE* pbEnd, UINT32* advance) { - UINT runLength; + UINT runLength = 0; WINPR_ASSERT(pbOrderHdr); WINPR_ASSERT(pbEnd); @@ -277,7 +277,7 @@ static UINT ExtractRunLengthRegular(const BYTE* pbOrderHdr, const BYTE* pbEnd, U static UINT ExtractRunLengthMegaMega(const BYTE* pbOrderHdr, const BYTE* pbEnd, UINT32* advance) { - UINT runLength; + UINT runLength = 0; WINPR_ASSERT(pbOrderHdr); WINPR_ASSERT(pbEnd); @@ -297,7 +297,7 @@ static UINT ExtractRunLengthMegaMega(const BYTE* pbOrderHdr, const BYTE* pbEnd, static UINT ExtractRunLengthLite(const BYTE* pbOrderHdr, const BYTE* pbEnd, UINT32* advance) { - UINT runLength; + UINT runLength = 0; WINPR_ASSERT(pbOrderHdr); WINPR_ASSERT(pbEnd); @@ -532,9 +532,9 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* interleaved, const BYTE* UINT32 nYDst, UINT32 nDstWidth, UINT32 nDstHeight, const gdiPalette* palette) { - UINT32 scanline; - UINT32 SrcFormat; - UINT32 BufferSize; + UINT32 scanline = 0; + UINT32 SrcFormat = 0; + UINT32 BufferSize = 0; if (!interleaved || !pSrcData || !pDstData) { @@ -638,8 +638,8 @@ BOOL interleaved_compress(BITMAP_INTERLEAVED_CONTEXT* interleaved, BYTE* pDstDat UINT32 nSrcStep, UINT32 nXSrc, UINT32 nYSrc, const gdiPalette* palette, UINT32 bpp) { - BOOL status; - wStream* s; + BOOL status = 0; + wStream* s = NULL; UINT32 DstFormat = 0; const UINT32 maxSize = 64 * 64 * 4; @@ -715,7 +715,7 @@ BOOL bitmap_interleaved_context_reset(BITMAP_INTERLEAVED_CONTEXT* interleaved) BITMAP_INTERLEAVED_CONTEXT* bitmap_interleaved_context_new(BOOL Compressor) { - BITMAP_INTERLEAVED_CONTEXT* interleaved; + BITMAP_INTERLEAVED_CONTEXT* interleaved = NULL; interleaved = (BITMAP_INTERLEAVED_CONTEXT*)winpr_aligned_recalloc( NULL, 1, sizeof(BITMAP_INTERLEAVED_CONTEXT), 32); diff --git a/libfreerdp/codec/mppc.c b/libfreerdp/codec/mppc.c index a30895dee..e4f57a76c 100644 --- a/libfreerdp/codec/mppc.c +++ b/libfreerdp/codec/mppc.c @@ -88,17 +88,17 @@ static const UINT32 MPPC_MATCH_TABLE[256] = { int mppc_decompress(MPPC_CONTEXT* mppc, const BYTE* pSrcData, UINT32 SrcSize, const BYTE** ppDstData, UINT32* pDstSize, UINT32 flags) { - BYTE Literal; - BYTE* SrcPtr; - UINT32 CopyOffset; - UINT32 LengthOfMatch; - UINT32 accumulator; - BYTE* HistoryPtr; - BYTE* HistoryBuffer; - BYTE* HistoryBufferEnd; - UINT32 HistoryBufferSize; - UINT32 CompressionLevel; - wBitStream* bs; + BYTE Literal = 0; + BYTE* SrcPtr = NULL; + UINT32 CopyOffset = 0; + UINT32 LengthOfMatch = 0; + UINT32 accumulator = 0; + BYTE* HistoryPtr = NULL; + BYTE* HistoryBuffer = NULL; + BYTE* HistoryBufferEnd = NULL; + UINT32 HistoryBufferSize = 0; + UINT32 CompressionLevel = 0; + wBitStream* bs = NULL; WINPR_ASSERT(mppc); WINPR_ASSERT(pSrcData); @@ -435,26 +435,26 @@ int mppc_decompress(MPPC_CONTEXT* mppc, const BYTE* pSrcData, UINT32 SrcSize, int mppc_compress(MPPC_CONTEXT* mppc, const BYTE* pSrcData, UINT32 SrcSize, BYTE* pDstBuffer, const BYTE** ppDstData, UINT32* pDstSize, UINT32* pFlags) { - const BYTE* pSrcPtr; - const BYTE* pSrcEnd; - BYTE* MatchPtr; - UINT32 DstSize; - BYTE* pDstData; - UINT32 MatchIndex; - UINT32 accumulator; - BOOL PacketFlushed; - BOOL PacketAtFront; - DWORD CopyOffset; - DWORD LengthOfMatch; - BYTE* HistoryBuffer; - BYTE* HistoryPtr; - UINT32 HistoryOffset; - UINT32 HistoryBufferSize; - BYTE Sym1; - BYTE Sym2; - BYTE Sym3; - UINT32 CompressionLevel; - wBitStream* bs; + const BYTE* pSrcPtr = NULL; + const BYTE* pSrcEnd = NULL; + BYTE* MatchPtr = NULL; + UINT32 DstSize = 0; + BYTE* pDstData = NULL; + UINT32 MatchIndex = 0; + UINT32 accumulator = 0; + BOOL PacketFlushed = 0; + BOOL PacketAtFront = 0; + DWORD CopyOffset = 0; + DWORD LengthOfMatch = 0; + BYTE* HistoryBuffer = NULL; + BYTE* HistoryPtr = NULL; + UINT32 HistoryOffset = 0; + UINT32 HistoryBufferSize = 0; + BYTE Sym1 = 0; + BYTE Sym2 = 0; + BYTE Sym3 = 0; + UINT32 CompressionLevel = 0; + wBitStream* bs = NULL; WINPR_ASSERT(mppc); WINPR_ASSERT(pSrcData); diff --git a/libfreerdp/codec/ncrush.c b/libfreerdp/codec/ncrush.c index 4ffa2db5f..8bfe0b105 100644 --- a/libfreerdp/codec/ncrush.c +++ b/libfreerdp/codec/ncrush.c @@ -1930,7 +1930,7 @@ static INLINE UINT16 get_word(const BYTE* data) static INLINE UINT32 get_dword(const BYTE* data) { - UINT32 tmp; + UINT32 tmp = 0; WINPR_ASSERT(data); tmp = *data++; tmp |= (UINT32)*data++ << 8U; @@ -2015,21 +2015,21 @@ static INLINE void NCrushWriteFinish(BYTE** DstPtr, UINT32 accumulator) int ncrush_decompress(NCRUSH_CONTEXT* ncrush, const BYTE* pSrcData, UINT32 SrcSize, const BYTE** ppDstData, UINT32* pDstSize, UINT32 flags) { - UINT32 index; - BYTE Literal; - UINT32 IndexLEC; - UINT32 BitLength; - UINT32 CopyOffset; - UINT32 CopyLength; - UINT32 OldCopyOffset; - const BYTE* CopyOffsetPtr; - UINT32 LengthOfMatch; - UINT32 CopyOffsetIndex; - UINT32 OffsetCacheIndex; - UINT32 CopyOffsetBits; - UINT32 CopyOffsetBase; - UINT32 LengthOfMatchBits; - UINT32 LengthOfMatchBase; + UINT32 index = 0; + BYTE Literal = 0; + UINT32 IndexLEC = 0; + UINT32 BitLength = 0; + UINT32 CopyOffset = 0; + UINT32 CopyLength = 0; + UINT32 OldCopyOffset = 0; + const BYTE* CopyOffsetPtr = NULL; + UINT32 LengthOfMatch = 0; + UINT32 CopyOffsetIndex = 0; + UINT32 OffsetCacheIndex = 0; + UINT32 CopyOffsetBits = 0; + UINT32 CopyOffsetBase = 0; + UINT32 LengthOfMatchBits = 0; + UINT32 LengthOfMatchBase = 0; WINPR_ASSERT(ncrush); WINPR_ASSERT(pSrcData); @@ -2315,7 +2315,7 @@ static int ncrush_hash_table_add(NCRUSH_CONTEXT* ncrush, const BYTE* pSrcData, U UINT32 HistoryOffset) { const BYTE* SrcPtr = pSrcData; - UINT32 Hash; + UINT32 Hash = 0; UINT32 Offset = HistoryOffset; UINT32 EndOffset = Offset + SrcSize - 8; @@ -2337,8 +2337,8 @@ static int ncrush_hash_table_add(NCRUSH_CONTEXT* ncrush, const BYTE* pSrcData, U static int ncrush_find_match_length(const BYTE* Ptr1, const BYTE* Ptr2, BYTE* HistoryPtr) { - BYTE val1; - BYTE val2; + BYTE val1 = 0; + BYTE val2 = 0; const BYTE* Ptr = Ptr1; WINPR_ASSERT(Ptr1); @@ -2363,15 +2363,15 @@ static int ncrush_find_match_length(const BYTE* Ptr1, const BYTE* Ptr2, BYTE* Hi static int ncrush_find_best_match(NCRUSH_CONTEXT* ncrush, UINT16 HistoryOffset, UINT32* pMatchOffset) { - int i; - int j; - int Length; - int MatchLength; - BYTE* MatchPtr; - UINT16 Offset; - UINT16 NextOffset; - UINT16 MatchOffset; - BYTE* HistoryBuffer; + int i = 0; + int j = 0; + int Length = 0; + int MatchLength = 0; + BYTE* MatchPtr = NULL; + UINT16 Offset = 0; + UINT16 NextOffset = 0; + UINT16 MatchOffset = 0; + BYTE* HistoryBuffer = NULL; WINPR_ASSERT(ncrush); WINPR_ASSERT(pMatchOffset); @@ -2482,11 +2482,11 @@ static int ncrush_find_best_match(NCRUSH_CONTEXT* ncrush, UINT16 HistoryOffset, static int ncrush_move_encoder_windows(NCRUSH_CONTEXT* ncrush, BYTE* HistoryPtr) { - int i; - int j; - int NewHash; - int NewMatch; - UINT32 HistoryOffset; + int i = 0; + int j = 0; + int NewHash = 0; + int NewMatch = 0; + UINT32 HistoryOffset = 0; WINPR_ASSERT(ncrush); WINPR_ASSERT(HistoryPtr); @@ -2534,38 +2534,38 @@ static int ncrush_move_encoder_windows(NCRUSH_CONTEXT* ncrush, BYTE* HistoryPtr) int ncrush_compress(NCRUSH_CONTEXT* ncrush, const BYTE* pSrcData, UINT32 SrcSize, BYTE* pDstBuffer, const BYTE** ppDstData, UINT32* pDstSize, UINT32* pFlags) { - BYTE Literal; - const BYTE* SrcPtr; - BYTE* DstPtr; - UINT32 bits; - UINT32 offset; - UINT16 Mask; - UINT32 MaskedBits; - UINT32 accumulator; - const BYTE* SrcEndPtr; - BYTE* DstEndPtr; - BYTE* HistoryPtr; - BYTE* pDstData; - UINT32 DstSize; + BYTE Literal = 0; + const BYTE* SrcPtr = NULL; + BYTE* DstPtr = NULL; + UINT32 bits = 0; + UINT32 offset = 0; + UINT16 Mask = 0; + UINT32 MaskedBits = 0; + UINT32 accumulator = 0; + const BYTE* SrcEndPtr = NULL; + BYTE* DstEndPtr = NULL; + BYTE* HistoryPtr = NULL; + BYTE* pDstData = NULL; + UINT32 DstSize = 0; BOOL PacketAtFront = FALSE; BOOL PacketFlushed = FALSE; - UINT32 MatchLength; - UINT32 IndexLEC; - UINT32 IndexLOM; - UINT32 IndexCO; - UINT32 CodeLEC; - UINT32 BitLength; - UINT32 CopyOffset; - UINT32 MatchOffset; - UINT32 OldCopyOffset; - UINT32* OffsetCache; - UINT32 OffsetCacheIndex; - UINT32 HistoryOffset; - BYTE* HistoryBuffer; - UINT32 HistoryBufferSize; - BYTE* HistoryBufferEndPtr; - UINT32 CopyOffsetIndex; - UINT32 CopyOffsetBits; + UINT32 MatchLength = 0; + UINT32 IndexLEC = 0; + UINT32 IndexLOM = 0; + UINT32 IndexCO = 0; + UINT32 CodeLEC = 0; + UINT32 BitLength = 0; + UINT32 CopyOffset = 0; + UINT32 MatchOffset = 0; + UINT32 OldCopyOffset = 0; + UINT32* OffsetCache = NULL; + UINT32 OffsetCacheIndex = 0; + UINT32 HistoryOffset = 0; + BYTE* HistoryBuffer = NULL; + UINT32 HistoryBufferSize = 0; + BYTE* HistoryBufferEndPtr = NULL; + UINT32 CopyOffsetIndex = 0; + UINT32 CopyOffsetBits = 0; UINT32 CompressionLevel = 2; WINPR_ASSERT(ncrush); @@ -2649,7 +2649,7 @@ int ncrush_compress(NCRUSH_CONTEXT* ncrush, const BYTE* pSrcData, UINT32 SrcSize if (ncrush->MatchTable[HistoryOffset]) { - int rc; + int rc = 0; MatchOffset = 0; rc = ncrush_find_best_match(ncrush, HistoryOffset, &MatchOffset); @@ -2942,10 +2942,10 @@ int ncrush_compress(NCRUSH_CONTEXT* ncrush, const BYTE* pSrcData, UINT32 SrcSize static int ncrush_generate_tables(NCRUSH_CONTEXT* context) { - UINT32 k; - UINT32 i; - int j; - int l; + UINT32 k = 0; + UINT32 i = 0; + int j = 0; + int l = 0; k = 0; WINPR_ASSERT(context); diff --git a/libfreerdp/codec/nsc.c b/libfreerdp/codec/nsc.c index 5a5056075..31cb5ffa3 100644 --- a/libfreerdp/codec/nsc.c +++ b/libfreerdp/codec/nsc.c @@ -48,11 +48,11 @@ static BOOL nsc_decode(NSC_CONTEXT* context) { - UINT16 x; - UINT16 y; - UINT16 rw; - BYTE shift; - BYTE* bmpdata; + UINT16 x = 0; + UINT16 y = 0; + UINT16 rw = 0; + BYTE shift = 0; + BYTE* bmpdata = NULL; size_t pos = 0; if (!context) @@ -67,9 +67,9 @@ static BOOL nsc_decode(NSC_CONTEXT* context) for (y = 0; y < context->height; y++) { - const BYTE* yplane; - const BYTE* coplane; - const BYTE* cgplane; + const BYTE* yplane = NULL; + const BYTE* coplane = NULL; + const BYTE* cgplane = NULL; const BYTE* aplane = context->priv->PlaneBuffers[3] + y * context->width; /* A */ if (context->ChromaSubsamplingLevel) @@ -428,9 +428,9 @@ BOOL nsc_process_message(NSC_CONTEXT* context, UINT16 bpp, UINT32 width, UINT32 UINT32 nDstStride, UINT32 nXDst, UINT32 nYDst, UINT32 nWidth, UINT32 nHeight, UINT32 flip) { - wStream* s; + wStream* s = NULL; wStream sbuffer = { 0 }; - BOOL ret; + BOOL ret = 0; if (!context || !data || !pDstData) return FALSE; @@ -477,7 +477,7 @@ BOOL nsc_process_message(NSC_CONTEXT* context, UINT16 bpp, UINT32 width, UINT32 /* RLE decode */ { - BOOL rc; + BOOL rc = 0; PROFILER_ENTER(context->priv->prof_nsc_rle_decompress_data) rc = nsc_rle_decompress_data(context); PROFILER_EXIT(context->priv->prof_nsc_rle_decompress_data) @@ -487,7 +487,7 @@ BOOL nsc_process_message(NSC_CONTEXT* context, UINT16 bpp, UINT32 width, UINT32 } /* Colorloss recover, Chroma supersample and AYCoCg to ARGB Conversion in one step */ { - BOOL rc; + BOOL rc = 0; PROFILER_ENTER(context->priv->prof_nsc_decode) rc = context->decode(context); PROFILER_EXIT(context->priv->prof_nsc_decode) diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c index 697c9e8ee..0478a6032 100644 --- a/libfreerdp/codec/nsc_encode.c +++ b/libfreerdp/codec/nsc_encode.c @@ -58,10 +58,10 @@ static BOOL nsc_write_message(NSC_CONTEXT* context, wStream* s, const NSC_MESSAG static BOOL nsc_context_initialize_encode(NSC_CONTEXT* context) { - int i; - UINT32 length; - UINT32 tempWidth; - UINT32 tempHeight; + int i = 0; + UINT32 length = 0; + UINT32 tempWidth = 0; + UINT32 tempHeight = 0; tempWidth = ROUND_UP_TO(context->width, 8); tempHeight = ROUND_UP_TO(context->height, 2); /* The maximum length a decoded plane can reach in all cases */ @@ -112,20 +112,22 @@ fail: static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UINT32 scanline) { - UINT16 x; - UINT16 y; - UINT16 rw; - BYTE ccl; - const BYTE* src; + UINT16 x = 0; + UINT16 y = 0; + UINT16 rw = 0; + BYTE ccl = 0; + const BYTE* src = NULL; + const UINT32* src_32 = NULL; + const UINT16* src_16 = NULL; BYTE* yplane = NULL; BYTE* coplane = NULL; BYTE* cgplane = NULL; BYTE* aplane = NULL; - INT16 r_val; - INT16 g_val; - INT16 b_val; - BYTE a_val; - UINT32 tempWidth; + INT16 r_val = 0; + INT16 g_val = 0; + INT16 b_val = 0; + BYTE a_val = 0; + UINT32 tempWidth = 0; tempWidth = ROUND_UP_TO(context->width, 8); rw = (context->ChromaSubsamplingLevel ? tempWidth : context->width); @@ -205,8 +207,8 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI case PIXEL_FORMAT_A4: { - int shift; - BYTE idx; + int shift = 0; + BYTE idx = 0; shift = (7 - (x % 8)); idx = ((*src) >> shift) & 1; idx |= (((*(src + 1)) >> shift) & 1) << 1; @@ -271,9 +273,9 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI static BOOL nsc_encode_subsampling(NSC_CONTEXT* context) { - UINT32 y; - UINT32 tempWidth; - UINT32 tempHeight; + UINT32 y = 0; + UINT32 tempWidth = 0; + UINT32 tempHeight = 0; if (!context) return FALSE; @@ -289,7 +291,7 @@ static BOOL nsc_encode_subsampling(NSC_CONTEXT* context) for (y = 0; y < tempHeight >> 1; y++) { - UINT32 x; + UINT32 x = 0; BYTE* co_dst = context->priv->PlaneBuffers[1] + y * (tempWidth >> 1); BYTE* cg_dst = context->priv->PlaneBuffers[2] + y * (tempWidth >> 1); const INT8* co_src0 = (INT8*)context->priv->PlaneBuffers[1] + (y << 1) * tempWidth; @@ -334,7 +336,7 @@ BOOL nsc_encode(NSC_CONTEXT* context, const BYTE* bmpdata, UINT32 rowstride) static UINT32 nsc_rle_encode(const BYTE* in, BYTE* out, UINT32 originalSize) { - UINT32 left; + UINT32 left = 0; UINT32 runlength = 1; UINT32 planeSize = 0; left = originalSize; @@ -388,9 +390,9 @@ static UINT32 nsc_rle_encode(const BYTE* in, BYTE* out, UINT32 originalSize) static void nsc_rle_compress_data(NSC_CONTEXT* context) { - UINT16 i; - UINT32 planeSize; - UINT32 originalSize; + UINT16 i = 0; + UINT32 planeSize = 0; + UINT32 originalSize = 0; for (i = 0; i < 4; i++) { @@ -419,9 +421,9 @@ static void nsc_rle_compress_data(NSC_CONTEXT* context) static UINT32 nsc_compute_byte_count(NSC_CONTEXT* context, UINT32* ByteCount, UINT32 width, UINT32 height) { - UINT32 tempWidth; - UINT32 tempHeight; - UINT32 maxPlaneSize; + UINT32 tempWidth = 0; + UINT32 tempHeight = 0; + UINT32 maxPlaneSize = 0; tempWidth = ROUND_UP_TO(width, 8); tempHeight = ROUND_UP_TO(height, 2); maxPlaneSize = tempWidth * tempHeight + 16; @@ -446,7 +448,7 @@ static UINT32 nsc_compute_byte_count(NSC_CONTEXT* context, UINT32* ByteCount, UI BOOL nsc_write_message(NSC_CONTEXT* context, wStream* s, const NSC_MESSAGE* message) { - UINT32 totalPlaneByteCount; + UINT32 totalPlaneByteCount = 0; totalPlaneByteCount = message->LumaPlaneByteCount + message->OrangeChromaPlaneByteCount + message->GreenChromaPlaneByteCount + message->AlphaPlaneByteCount; @@ -483,7 +485,7 @@ BOOL nsc_write_message(NSC_CONTEXT* context, wStream* s, const NSC_MESSAGE* mess BOOL nsc_compose_message(NSC_CONTEXT* context, wStream* s, const BYTE* data, UINT32 width, UINT32 height, UINT32 scanline) { - BOOL rc; + BOOL rc = 0; NSC_MESSAGE message = { 0 }; if (!context || !s || !data) diff --git a/libfreerdp/codec/nsc_sse2.c b/libfreerdp/codec/nsc_sse2.c index 4c98c1653..9033933cd 100644 --- a/libfreerdp/codec/nsc_sse2.c +++ b/libfreerdp/codec/nsc_sse2.c @@ -35,11 +35,11 @@ static BOOL nsc_encode_argb_to_aycocg_sse2(NSC_CONTEXT* context, const BYTE* data, UINT32 scanline) { - UINT16 x; - UINT16 y; - UINT16 rw; - BYTE ccl; - const BYTE* src; + UINT16 x = 0; + UINT16 y = 0; + UINT16 rw = 0; + BYTE ccl = 0; + const BYTE* src = NULL; BYTE* yplane = NULL; BYTE* coplane = NULL; BYTE* cgplane = NULL; @@ -51,7 +51,7 @@ static BOOL nsc_encode_argb_to_aycocg_sse2(NSC_CONTEXT* context, const BYTE* dat __m128i y_val; __m128i co_val; __m128i cg_val; - UINT32 tempWidth; + UINT32 tempWidth = 0; if (!context || !data || (scanline == 0)) return FALSE; @@ -204,7 +204,7 @@ static BOOL nsc_encode_argb_to_aycocg_sse2(NSC_CONTEXT* context, const BYTE* dat case PIXEL_FORMAT_A4: { - int shift; + int shift = 0; BYTE idx[8]; for (shift = 7; shift >= 0; shift--) @@ -318,15 +318,15 @@ static BOOL nsc_encode_argb_to_aycocg_sse2(NSC_CONTEXT* context, const BYTE* dat static void nsc_encode_subsampling_sse2(NSC_CONTEXT* context) { - UINT32 y; - BYTE* co_dst; - BYTE* cg_dst; - INT8* co_src0; - INT8* co_src1; - INT8* cg_src0; - INT8* cg_src1; - UINT32 tempWidth; - UINT32 tempHeight; + UINT32 y = 0; + BYTE* co_dst = NULL; + BYTE* cg_dst = NULL; + INT8* co_src0 = NULL; + INT8* co_src1 = NULL; + INT8* cg_src0 = NULL; + INT8* cg_src1 = NULL; + UINT32 tempWidth = 0; + UINT32 tempHeight = 0; __m128i t; __m128i val; __m128i mask = _mm_set1_epi16(0xFF); @@ -335,7 +335,7 @@ static void nsc_encode_subsampling_sse2(NSC_CONTEXT* context) for (y = 0; y < tempHeight >> 1; y++) { - UINT32 x; + UINT32 x = 0; co_dst = context->priv->PlaneBuffers[1] + y * (tempWidth >> 1); cg_dst = context->priv->PlaneBuffers[2] + y * (tempWidth >> 1); co_src0 = (INT8*)context->priv->PlaneBuffers[1] + (y << 1) * tempWidth; diff --git a/libfreerdp/codec/planar.c b/libfreerdp/codec/planar.c index 5f3be67a2..c1eb2ca52 100644 --- a/libfreerdp/codec/planar.c +++ b/libfreerdp/codec/planar.c @@ -167,9 +167,9 @@ static INLINE INT32 planar_skip_plane_rle(const BYTE* pSrcData, UINT32 SrcSize, UINT32 nHeight) { UINT32 used = 0; - UINT32 x; - UINT32 y; - BYTE controlByte; + UINT32 x = 0; + UINT32 y = 0; + BYTE controlByte = 0; WINPR_ASSERT(pSrcData); @@ -177,8 +177,8 @@ static INLINE INT32 planar_skip_plane_rle(const BYTE* pSrcData, UINT32 SrcSize, { for (x = 0; x < nWidth;) { - int cRawBytes; - int nRunLength; + int cRawBytes = 0; + int nRunLength = 0; if (used >= SrcSize) { @@ -232,15 +232,15 @@ static INLINE INT32 planar_skip_plane_rle(const BYTE* pSrcData, UINT32 SrcSize, static INLINE INT32 planar_decompress_plane_rle_only(const BYTE* pSrcData, UINT32 SrcSize, BYTE* pDstData, UINT32 nWidth, UINT32 nHeight) { - INT32 x; - INT32 y; - UINT32 pixel; - UINT32 cRawBytes; - UINT32 nRunLength; - INT32 deltaValue; - BYTE controlByte; - BYTE* currentScanline; - BYTE* previousScanline; + INT32 x = 0; + INT32 y = 0; + UINT32 pixel = 0; + UINT32 cRawBytes = 0; + UINT32 nRunLength = 0; + INT32 deltaValue = 0; + BYTE controlByte = 0; + BYTE* currentScanline = NULL; + BYTE* previousScanline = NULL; const BYTE* srcp = pSrcData; WINPR_ASSERT(nHeight <= INT32_MAX); @@ -355,18 +355,18 @@ static INLINE INT32 planar_decompress_plane_rle(const BYTE* pSrcData, UINT32 Src UINT32 nYDst, UINT32 nWidth, UINT32 nHeight, UINT32 nChannel, BOOL vFlip) { - INT32 x; - INT32 y; - UINT32 pixel; - UINT32 cRawBytes; - UINT32 nRunLength; - INT32 deltaValue; - INT32 beg; - INT32 end; - INT32 inc; - BYTE controlByte; - BYTE* currentScanline; - BYTE* previousScanline; + INT32 x = 0; + INT32 y = 0; + UINT32 pixel = 0; + UINT32 cRawBytes = 0; + UINT32 nRunLength = 0; + INT32 deltaValue = 0; + INT32 beg = 0; + INT32 end = 0; + INT32 inc = 0; + BYTE controlByte = 0; + BYTE* currentScanline = NULL; + BYTE* previousScanline = NULL; const BYTE* srcp = pSrcData; WINPR_ASSERT(nHeight <= INT32_MAX); @@ -494,11 +494,11 @@ static INLINE INT32 planar_set_plane(BYTE bValue, BYTE* pDstData, INT32 nDstStep UINT32 nYDst, UINT32 nWidth, UINT32 nHeight, UINT32 nChannel, BOOL vFlip) { - INT32 x; - INT32 y; - INT32 beg; - INT32 end; - INT32 inc; + INT32 x = 0; + INT32 y = 0; + INT32 beg = 0; + INT32 end = 0; + INT32 inc = 0; WINPR_ASSERT(nHeight <= INT32_MAX); WINPR_ASSERT(nWidth <= INT32_MAX); @@ -534,7 +534,7 @@ static INLINE INT32 planar_set_plane(BYTE bValue, BYTE* pDstData, INT32 nDstStep static INLINE BOOL writeLine(BYTE** ppRgba, UINT32 DstFormat, UINT32 width, const BYTE** ppR, const BYTE** ppG, const BYTE** ppB, const BYTE** ppA) { - UINT32 x; + UINT32 x = 0; WINPR_ASSERT(ppRgba); WINPR_ASSERT(ppR); @@ -599,10 +599,10 @@ static INLINE BOOL planar_decompress_planes_raw(const BYTE* pSrcData[4], BYTE* p UINT32 nYDst, UINT32 nWidth, UINT32 nHeight, BOOL vFlip, UINT32 totalHeight) { - INT32 y; - INT32 beg; - INT32 end; - INT32 inc; + INT32 y = 0; + INT32 beg = 0; + INT32 end = 0; + INT32 inc = 0; const BYTE* pR = pSrcData[0]; const BYTE* pG = pSrcData[1]; const BYTE* pB = pSrcData[2]; @@ -642,7 +642,7 @@ static INLINE BOOL planar_decompress_planes_raw(const BYTE* pSrcData[4], BYTE* p for (y = beg; y != end; y += inc) { - BYTE* pRGB; + BYTE* pRGB = NULL; if (y > (INT64)nHeight) { @@ -665,7 +665,7 @@ static BOOL planar_subsample_expand(const BYTE* plane, size_t planeLength, UINT3 BYTE* deltaPlane) { size_t pos = 0; - UINT32 y; + UINT32 y = 0; WINPR_UNUSED(planeLength); WINPR_ASSERT(plane); @@ -688,7 +688,7 @@ static BOOL planar_subsample_expand(const BYTE* plane, size_t planeLength, UINT3 for (y = 0; y < nHeight; y++) { const BYTE* src = plane + y / 2 * nPlaneWidth; - UINT32 x; + UINT32 x = 0; for (x = 0; x < nWidth; x++) { @@ -704,22 +704,22 @@ BOOL planar_decompress(BITMAP_PLANAR_CONTEXT* planar, const BYTE* pSrcData, UINT UINT32 nDstStep, UINT32 nXDst, UINT32 nYDst, UINT32 nDstWidth, UINT32 nDstHeight, BOOL vFlip) { - BOOL cs; - BOOL rle; - UINT32 cll; - BOOL alpha; + BOOL cs = 0; + BOOL rle = 0; + UINT32 cll = 0; + BOOL alpha = 0; BOOL useAlpha = FALSE; - INT32 status; - const BYTE* srcp; - UINT32 subSize; - UINT32 subWidth; - UINT32 subHeight; - UINT32 planeSize; + INT32 status = 0; + const BYTE* srcp = NULL; + UINT32 subSize = 0; + UINT32 subWidth = 0; + UINT32 subHeight = 0; + UINT32 planeSize = 0; INT32 rleSizes[4] = { 0, 0, 0, 0 }; UINT32 rawSizes[4]; UINT32 rawWidths[4]; UINT32 rawHeights[4]; - BYTE FormatHeader; + BYTE FormatHeader = 0; const BYTE* planes[4] = { 0 }; const UINT32 w = MIN(nSrcWidth, nDstWidth); const UINT32 h = MIN(nSrcHeight, nDstHeight); @@ -888,7 +888,7 @@ BOOL planar_decompress(BITMAP_PLANAR_CONTEXT* planar, const BYTE* pSrcData, UINT if (!cll) /* RGB */ { - UINT32 TempFormat; + UINT32 TempFormat = 0; BYTE* pTempData = pDstData; UINT32 nTempStep = nDstStep; UINT32 nTotalHeight = nYDst + nDstHeight; @@ -975,7 +975,7 @@ BOOL planar_decompress(BITMAP_PLANAR_CONTEXT* planar, const BYTE* pSrcData, UINT } else /* YCoCg */ { - UINT32 TempFormat; + UINT32 TempFormat = 0; BYTE* pTempData = planar->pTempData; UINT32 nTempStep = planar->nTempStep; UINT32 nTotalHeight = planar->maxHeight; @@ -1105,8 +1105,8 @@ static INLINE BOOL freerdp_split_color_planes(BITMAP_PLANAR_CONTEXT* planar, con if (planar->topdown) { - UINT32 i; - UINT32 j; + UINT32 i = 0; + UINT32 j = 0; UINT32 k = 0; for (i = 0; i < height; i++) { @@ -1124,8 +1124,8 @@ static INLINE BOOL freerdp_split_color_planes(BITMAP_PLANAR_CONTEXT* planar, con } else { - INT64 i; - UINT32 j; + INT64 i = 0; + UINT32 j = 0; UINT32 k = 0; for (i = (INT64)height - 1; i >= 0; i--) @@ -1149,10 +1149,10 @@ static INLINE UINT32 freerdp_bitmap_planar_write_rle_bytes(const BYTE* pInBuffer UINT32 nRunLength, BYTE* pOutBuffer, UINT32 outBufferSize) { - const BYTE* pInput; - BYTE* pOutput; - BYTE controlByte; - UINT32 nBytesToWrite; + const BYTE* pInput = NULL; + BYTE* pOutput = NULL; + BYTE controlByte = 0; + UINT32 nBytesToWrite = 0; pInput = pInBuffer; pOutput = pOutBuffer; @@ -1263,15 +1263,15 @@ static INLINE UINT32 freerdp_bitmap_planar_encode_rle_bytes(const BYTE* pInBuffe UINT32 inBufferSize, BYTE* pOutBuffer, UINT32 outBufferSize) { - BYTE symbol; - const BYTE* pInput; - BYTE* pOutput; - const BYTE* pBytes; - UINT32 cRawBytes; - UINT32 nRunLength; - UINT32 bSymbolMatch; - UINT32 nBytesWritten; - UINT32 nTotalBytesWritten; + BYTE symbol = 0; + const BYTE* pInput = NULL; + BYTE* pOutput = NULL; + const BYTE* pBytes = NULL; + UINT32 cRawBytes = 0; + UINT32 nRunLength = 0; + UINT32 bSymbolMatch = 0; + UINT32 nBytesWritten = 0; + UINT32 nTotalBytesWritten = 0; symbol = 0; cRawBytes = 0; nRunLength = 0; @@ -1341,12 +1341,12 @@ static INLINE UINT32 freerdp_bitmap_planar_encode_rle_bytes(const BYTE* pInBuffe BOOL freerdp_bitmap_planar_compress_plane_rle(const BYTE* inPlane, UINT32 width, UINT32 height, BYTE* outPlane, UINT32* dstSize) { - UINT32 index; - const BYTE* pInput; - BYTE* pOutput; - UINT32 outBufferSize; - UINT32 nBytesWritten; - UINT32 nTotalBytesWritten; + UINT32 index = 0; + const BYTE* pInput = NULL; + BYTE* pOutput = NULL; + UINT32 outBufferSize = 0; + UINT32 nBytesWritten = 0; + UINT32 nTotalBytesWritten = 0; if (!outPlane) return FALSE; @@ -1433,12 +1433,12 @@ static INLINE BOOL freerdp_bitmap_planar_compress_planes_rle(BYTE* inPlanes[4], BYTE* freerdp_bitmap_planar_delta_encode_plane(const BYTE* inPlane, UINT32 width, UINT32 height, BYTE* outPlane) { - char s2c; - UINT32 y; - UINT32 x; - BYTE* outPtr; - const BYTE* srcPtr; - const BYTE* prevLinePtr; + char s2c = 0; + UINT32 y = 0; + UINT32 x = 0; + BYTE* outPtr = NULL; + const BYTE* srcPtr = NULL; + const BYTE* prevLinePtr = NULL; if (!outPlane) { @@ -1473,7 +1473,7 @@ BYTE* freerdp_bitmap_planar_delta_encode_plane(const BYTE* inPlane, UINT32 width static INLINE BOOL freerdp_bitmap_planar_delta_encode_planes(BYTE* inPlanes[4], UINT32 width, UINT32 height, BYTE* outPlanes[4]) { - UINT32 i; + UINT32 i = 0; for (i = 0; i < 4; i++) { @@ -1491,9 +1491,9 @@ BYTE* freerdp_bitmap_compress_planar(BITMAP_PLANAR_CONTEXT* context, const BYTE* UINT32 format, UINT32 width, UINT32 height, UINT32 scanline, BYTE* dstData, UINT32* pDstSize) { - UINT32 size; - BYTE* dstp; - UINT32 planeSize; + UINT32 size = 0; + BYTE* dstp = NULL; + UINT32 planeSize = 0; UINT32 dstSizes[4] = { 0 }; BYTE FormatHeader = 0; diff --git a/libfreerdp/codec/progressive.c b/libfreerdp/codec/progressive.c index 2bd643a14..22e475ff9 100644 --- a/libfreerdp/codec/progressive.c +++ b/libfreerdp/codec/progressive.c @@ -58,7 +58,7 @@ typedef struct static INLINE void progressive_component_codec_quant_read(wStream* s, RFX_COMPONENT_CODEC_QUANT* quantVal) { - BYTE b; + BYTE b = 0; Stream_Read_UINT8(s, b); quantVal->LL3 = b & 0x0F; quantVal->HL3 = b >> 4; @@ -319,7 +319,7 @@ static INLINE BOOL progressive_rfx_quant_cmp_equal(const RFX_COMPONENT_CODEC_QUA static INLINE BOOL progressive_set_surface_data(PROGRESSIVE_CONTEXT* progressive, UINT16 surfaceId, void* pData) { - ULONG_PTR key; + ULONG_PTR key = 0; key = ((ULONG_PTR)surfaceId) + 1; if (pData) @@ -354,7 +354,7 @@ static void progressive_tile_free(RFX_PROGRESSIVE_TILE* tile) static void progressive_surface_context_free(void* ptr) { PROGRESSIVE_SURFACE_CONTEXT* surface = ptr; - UINT32 index; + UINT32 index = 0; if (!surface) return; @@ -473,9 +473,9 @@ static BOOL progressive_surface_tile_replace(PROGRESSIVE_SURFACE_CONTEXT* surfac PROGRESSIVE_BLOCK_REGION* region, const RFX_PROGRESSIVE_TILE* tile, BOOL upgrade) { - RFX_PROGRESSIVE_TILE* t; + RFX_PROGRESSIVE_TILE* t = NULL; - size_t zIdx; + size_t zIdx = 0; if (!surface || !tile) return FALSE; @@ -603,17 +603,17 @@ static INLINE void progressive_rfx_idwt_x(const INT16* pLowBand, size_t nLowStep size_t nDstStep, size_t nLowCount, size_t nHighCount, size_t nDstCount) { - size_t i; - INT16 L0; - INT16 H0; - INT16 H1; - INT16 X0; - INT16 X1; - INT16 X2; + size_t i = 0; + INT16 L0 = 0; + INT16 H0 = 0; + INT16 H1 = 0; + INT16 X0 = 0; + INT16 X1 = 0; + INT16 X2 = 0; for (i = 0; i < nDstCount; i++) { - size_t j; + size_t j = 0; const INT16* pL = pLowBand; const INT16* pH = pHighBand; INT16* pX = pDstBand; @@ -678,17 +678,17 @@ static INLINE void progressive_rfx_idwt_y(const INT16* pLowBand, size_t nLowStep size_t nDstStep, size_t nLowCount, size_t nHighCount, size_t nDstCount) { - size_t i; - INT16 L0; - INT16 H0; - INT16 H1; - INT16 X0; - INT16 X1; - INT16 X2; + size_t i = 0; + INT16 L0 = 0; + INT16 H0 = 0; + INT16 H1 = 0; + INT16 X0 = 0; + INT16 X1 = 0; + INT16 X2 = 0; for (i = 0; i < nDstCount; i++) { - size_t j; + size_t j = 0; const INT16* pL = pLowBand; const INT16* pH = pHighBand; INT16* pX = pDstBand; @@ -770,15 +770,15 @@ static INLINE size_t progressive_rfx_get_band_h_count(size_t level) static INLINE void progressive_rfx_dwt_2d_decode_block(INT16* buffer, INT16* temp, size_t level) { - size_t nDstStepX; - size_t nDstStepY; - INT16* HL; - INT16* LH; - INT16* HH; - INT16* LL; - INT16* L; - INT16* H; - INT16* LLx; + size_t nDstStepX = 0; + size_t nDstStepY = 0; + INT16* HL = NULL; + INT16* LH = NULL; + INT16* HH = NULL; + INT16* LL = NULL; + INT16* L = NULL; + INT16* H = NULL; + INT16* LLx = NULL; const size_t nBandL = progressive_rfx_get_band_l_count(level); const size_t nBandH = progressive_rfx_get_band_h_count(level); @@ -876,7 +876,7 @@ static INLINE int progressive_rfx_decode_component(PROGRESSIVE_CONTEXT* progress INT16* current, INT16* sign, BOOL coeffDiff, BOOL subbandDiff, BOOL extrapolate) { - int status; + int status = 0; const primitives_t* prims = primitives_get(); status = progressive->rfx_context->rlgr_decode(RLGR1, data, length, buffer, 4096); @@ -922,24 +922,24 @@ static INLINE int progressive_decompress_tile_first(PROGRESSIVE_CONTEXT* progres PROGRESSIVE_BLOCK_REGION* region, const PROGRESSIVE_BLOCK_CONTEXT* context) { - int rc; - BOOL diff; - BOOL sub; - BOOL extrapolate; - BYTE* pBuffer; + int rc = 0; + BOOL diff = 0; + BOOL sub = 0; + BOOL extrapolate = 0; + BYTE* pBuffer = NULL; INT16* pSign[3]; INT16* pSrcDst[3]; INT16* pCurrent[3]; RFX_COMPONENT_CODEC_QUANT shiftY = { 0 }; RFX_COMPONENT_CODEC_QUANT shiftCb = { 0 }; RFX_COMPONENT_CODEC_QUANT shiftCr = { 0 }; - RFX_COMPONENT_CODEC_QUANT* quantY; - RFX_COMPONENT_CODEC_QUANT* quantCb; - RFX_COMPONENT_CODEC_QUANT* quantCr; - RFX_COMPONENT_CODEC_QUANT* quantProgY; - RFX_COMPONENT_CODEC_QUANT* quantProgCb; - RFX_COMPONENT_CODEC_QUANT* quantProgCr; - RFX_PROGRESSIVE_CODEC_QUANT* quantProgVal; + RFX_COMPONENT_CODEC_QUANT* quantY = NULL; + RFX_COMPONENT_CODEC_QUANT* quantCb = NULL; + RFX_COMPONENT_CODEC_QUANT* quantCr = NULL; + RFX_COMPONENT_CODEC_QUANT* quantProgY = NULL; + RFX_COMPONENT_CODEC_QUANT* quantProgCb = NULL; + RFX_COMPONENT_CODEC_QUANT* quantProgCr = NULL; + RFX_PROGRESSIVE_CODEC_QUANT* quantProgVal = NULL; static const prim_size_t roi_64x64 = { 64, 64 }; const primitives_t* prims = primitives_get(); @@ -1058,11 +1058,11 @@ fail: static INLINE INT16 progressive_rfx_srl_read(RFX_PROGRESSIVE_UPGRADE_STATE* state, UINT32 numBits) { - UINT32 k; - UINT32 bit; - UINT32 max; - UINT32 mag; - UINT32 sign; + UINT32 k = 0; + UINT32 bit = 0; + UINT32 max = 0; + UINT32 mag = 0; + UINT32 sign = 0; wBitStream* bs = state->srl; if (state->nz) @@ -1145,9 +1145,9 @@ static INLINE INT16 progressive_rfx_srl_read(RFX_PROGRESSIVE_UPGRADE_STATE* stat static INLINE int progressive_rfx_upgrade_state_finish(RFX_PROGRESSIVE_UPGRADE_STATE* state) { - UINT32 pad; - wBitStream* srl; - wBitStream* raw; + UINT32 pad = 0; + wBitStream* srl = NULL; + wBitStream* raw = NULL; if (!state) return -1; @@ -1174,9 +1174,9 @@ static INLINE int progressive_rfx_upgrade_block(RFX_PROGRESSIVE_UPGRADE_STATE* s INT16* sign, UINT32 length, UINT32 shift, UINT32 bitPos, UINT32 numBits) { - UINT32 index; - INT16 input; - wBitStream* raw; + UINT32 index = 0; + INT16 input = 0; + wBitStream* raw = NULL; if (!numBits) return 1; @@ -1232,9 +1232,9 @@ static INLINE int progressive_rfx_upgrade_component( INT16* buffer, INT16* current, INT16* sign, const BYTE* srlData, UINT32 srlLen, const BYTE* rawData, UINT32 rawLen, BOOL coeffDiff, BOOL subbandDiff, BOOL extrapolate) { - int rc; - UINT32 aRawLen; - UINT32 aSrlLen; + int rc = 0; + UINT32 aRawLen = 0; + UINT32 aSrlLen = 0; wBitStream s_srl = { 0 }; wBitStream s_raw = { 0 }; RFX_PROGRESSIVE_UPGRADE_STATE state = { 0 }; @@ -1326,11 +1326,11 @@ static INLINE int progressive_decompress_tile_upgrade(PROGRESSIVE_CONTEXT* progr PROGRESSIVE_BLOCK_REGION* region, const PROGRESSIVE_BLOCK_CONTEXT* context) { - int status; - BOOL coeffDiff; - BOOL sub; - BOOL extrapolate; - BYTE* pBuffer; + int status = 0; + BOOL coeffDiff = 0; + BOOL sub = 0; + BOOL extrapolate = 0; + BYTE* pBuffer = NULL; INT16* pSign[3] = { 0 }; INT16* pSrcDst[3] = { 0 }; INT16* pCurrent[3] = { 0 }; @@ -1343,13 +1343,13 @@ static INLINE int progressive_decompress_tile_upgrade(PROGRESSIVE_CONTEXT* progr RFX_COMPONENT_CODEC_QUANT yNumBits = { 0 }; RFX_COMPONENT_CODEC_QUANT cbNumBits = { 0 }; RFX_COMPONENT_CODEC_QUANT crNumBits = { 0 }; - RFX_COMPONENT_CODEC_QUANT* quantY; - RFX_COMPONENT_CODEC_QUANT* quantCb; - RFX_COMPONENT_CODEC_QUANT* quantCr; - RFX_COMPONENT_CODEC_QUANT* quantProgY; - RFX_COMPONENT_CODEC_QUANT* quantProgCb; - RFX_COMPONENT_CODEC_QUANT* quantProgCr; - RFX_PROGRESSIVE_CODEC_QUANT* quantProg; + RFX_COMPONENT_CODEC_QUANT* quantY = NULL; + RFX_COMPONENT_CODEC_QUANT* quantCb = NULL; + RFX_COMPONENT_CODEC_QUANT* quantCr = NULL; + RFX_COMPONENT_CODEC_QUANT* quantProgY = NULL; + RFX_COMPONENT_CODEC_QUANT* quantProgCb = NULL; + RFX_COMPONENT_CODEC_QUANT* quantProgCr = NULL; + RFX_PROGRESSIVE_CODEC_QUANT* quantProg = NULL; static const prim_size_t roi_64x64 = { 64, 64 }; const primitives_t* prims = primitives_get(); @@ -1677,11 +1677,11 @@ static INLINE SSIZE_T progressive_process_tiles(PROGRESSIVE_CONTEXT* progressive const PROGRESSIVE_BLOCK_CONTEXT* context) { int status = 0; - size_t end; + size_t end = 0; const size_t start = Stream_GetPosition(s); - UINT16 index; - UINT16 blockType; - UINT32 blockLen; + UINT16 index = 0; + UINT16 blockType = 0; + UINT32 blockLen = 0; UINT32 count = 0; PTP_WORK* work_objects = NULL; PROGRESSIVE_TILE_PROCESS_WORK_PARAM* params = NULL; @@ -2032,7 +2032,7 @@ static INLINE SSIZE_T progressive_wb_read_region_header(PROGRESSIVE_CONTEXT* pro UINT32 blockLen, PROGRESSIVE_BLOCK_REGION* region) { - SSIZE_T len; + SSIZE_T len = 0; memset(region, 0, sizeof(PROGRESSIVE_BLOCK_REGION)); if (!Stream_CheckAndLogRequiredLength(TAG, s, 12)) @@ -2109,8 +2109,8 @@ static INLINE SSIZE_T progressive_wb_read_region_header(PROGRESSIVE_CONTEXT* pro static INLINE SSIZE_T progressive_wb_skip_region(PROGRESSIVE_CONTEXT* progressive, wStream* s, UINT16 blockType, UINT32 blockLen) { - SSIZE_T rc; - size_t total; + SSIZE_T rc = 0; + size_t total = 0; PROGRESSIVE_BLOCK_REGION* region = &progressive->region; rc = progressive_wb_read_region_header(progressive, s, blockType, blockLen, region); @@ -2133,14 +2133,14 @@ static INLINE SSIZE_T progressive_wb_region(PROGRESSIVE_CONTEXT* progressive, wS PROGRESSIVE_BLOCK_REGION* region) { SSIZE_T rc = -1; - UINT16 boxLeft; - UINT16 boxTop; - UINT16 boxRight; - UINT16 boxBottom; - UINT16 idxLeft; - UINT16 idxTop; - UINT16 idxRight; - UINT16 idxBottom; + UINT16 boxLeft = 0; + UINT16 boxTop = 0; + UINT16 boxRight = 0; + UINT16 boxBottom = 0; + UINT16 idxLeft = 0; + UINT16 idxTop = 0; + UINT16 idxRight = 0; + UINT16 idxBottom = 0; const PROGRESSIVE_BLOCK_CONTEXT* context = &progressive->context; if ((progressive->state & FLAG_WBT_FRAME_BEGIN) == 0) @@ -2251,8 +2251,8 @@ static SSIZE_T progressive_parse_block(PROGRESSIVE_CONTEXT* progressive, wStream PROGRESSIVE_SURFACE_CONTEXT* surface, PROGRESSIVE_BLOCK_REGION* region) { - UINT16 blockType; - UINT32 blockLen; + UINT16 blockType = 0; + UINT32 blockLen = 0; SSIZE_T rc = -1; wStream sub = { 0 }; @@ -2453,7 +2453,7 @@ fail: BOOL progressive_rfx_write_message_progressive_simple(PROGRESSIVE_CONTEXT* progressive, wStream* s, const RFX_MESSAGE* msg) { - RFX_CONTEXT* context; + RFX_CONTEXT* context = NULL; WINPR_ASSERT(progressive); WINPR_ASSERT(s); diff --git a/libfreerdp/codec/region.c b/libfreerdp/codec/region.c index 0317f04f6..4c5176eda 100644 --- a/libfreerdp/codec/region.c +++ b/libfreerdp/codec/region.c @@ -92,7 +92,7 @@ int region16_n_rects(const REGION16* region) const RECTANGLE_16* region16_rects(const REGION16* region, UINT32* nbRects) { - REGION16_DATA* data; + REGION16_DATA* data = NULL; if (nbRects) *nbRects = 0; @@ -113,7 +113,7 @@ const RECTANGLE_16* region16_rects(const REGION16* region, UINT32* nbRects) static INLINE RECTANGLE_16* region16_rects_noconst(REGION16* region) { - REGION16_DATA* data; + REGION16_DATA* data = NULL; data = region->data; if (!data) @@ -233,9 +233,9 @@ BOOL region16_copy(REGION16* dst, const REGION16* src) void region16_print(const REGION16* region) { - const RECTANGLE_16* rects; - UINT32 nbRects; - UINT32 i; + const RECTANGLE_16* rects = NULL; + UINT32 nbRects = 0; + UINT32 i = 0; int currentBandY = -1; rects = region16_rects(region, &nbRects); WLog_DBG(TAG, "nrects=%" PRIu32 "", nbRects); @@ -259,8 +259,8 @@ static void region16_copy_band_with_union(RECTANGLE_16* dst, const RECTANGLE_16* const RECTANGLE_16** srcPtr, RECTANGLE_16** dstPtr) { UINT16 refY = src->top; - const RECTANGLE_16* startOverlap; - const RECTANGLE_16* endOverlap; + const RECTANGLE_16* startOverlap = NULL; + const RECTANGLE_16* endOverlap = NULL; /* merges a band with the given rect * Input: @@ -420,11 +420,11 @@ static BOOL region16_simplify_bands(REGION16* region) * ==================== ==================== * */ - RECTANGLE_16* endBand; - int nbRects; - int finalNbRects; - int bandItems; - int toMove; + RECTANGLE_16* endBand = NULL; + int nbRects = 0; + int finalNbRects = 0; + int bandItems = 0; + int toMove = 0; finalNbRects = nbRects = region16_n_rects(region); if (nbRects < 2) @@ -491,17 +491,17 @@ static BOOL region16_simplify_bands(REGION16* region) BOOL region16_union_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* rect) { - const RECTANGLE_16* srcExtents; - RECTANGLE_16* dstExtents; - const RECTANGLE_16* currentBand; - const RECTANGLE_16* endSrcRect; - const RECTANGLE_16* nextBand; + const RECTANGLE_16* srcExtents = NULL; + RECTANGLE_16* dstExtents = NULL; + const RECTANGLE_16* currentBand = NULL; + const RECTANGLE_16* endSrcRect = NULL; + const RECTANGLE_16* nextBand = NULL; REGION16_DATA* newItems = NULL; REGION16_DATA* tmpItems = NULL; RECTANGLE_16* dstRect = NULL; - UINT32 usedRects; - UINT32 srcNbRects; - UINT16 topInterBand; + UINT32 usedRects = 0; + UINT32 srcNbRects = 0; + UINT16 topInterBand = 0; WINPR_ASSERT(src); WINPR_ASSERT(dst); srcExtents = region16_extents(src); @@ -687,10 +687,10 @@ BOOL region16_union_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* BOOL region16_intersects_rect(const REGION16* src, const RECTANGLE_16* arg2) { - const RECTANGLE_16* rect; - const RECTANGLE_16* endPtr; - const RECTANGLE_16* srcExtents; - UINT32 nbRects; + const RECTANGLE_16* rect = NULL; + const RECTANGLE_16* endPtr = NULL; + const RECTANGLE_16* srcExtents = NULL; + UINT32 nbRects = 0; if (!src || !src->data || !arg2) return FALSE; @@ -719,13 +719,13 @@ BOOL region16_intersects_rect(const REGION16* src, const RECTANGLE_16* arg2) BOOL region16_intersect_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* rect) { - REGION16_DATA* newItems; - const RECTANGLE_16* srcPtr; - const RECTANGLE_16* endPtr; - const RECTANGLE_16* srcExtents; - RECTANGLE_16* dstPtr; - UINT32 nbRects; - UINT32 usedRects; + REGION16_DATA* newItems = NULL; + const RECTANGLE_16* srcPtr = NULL; + const RECTANGLE_16* endPtr = NULL; + const RECTANGLE_16* srcExtents = NULL; + RECTANGLE_16* dstPtr = NULL; + UINT32 nbRects = 0; + UINT32 usedRects = 0; RECTANGLE_16 common; RECTANGLE_16 newExtents; WINPR_ASSERT(src); diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c index 2a36c1d00..3b8846606 100644 --- a/libfreerdp/codec/rfx.c +++ b/libfreerdp/codec/rfx.c @@ -212,15 +212,15 @@ RFX_CONTEXT* rfx_context_new(BOOL encoder) RFX_CONTEXT* rfx_context_new_ex(BOOL encoder, UINT32 ThreadingFlags) { - HKEY hKey; - LONG status; - DWORD dwType; - DWORD dwSize; - DWORD dwValue; + HKEY hKey = NULL; + LONG status = 0; + DWORD dwType = 0; + DWORD dwSize = 0; + DWORD dwValue = 0; SYSTEM_INFO sysinfo; - RFX_CONTEXT* context; - wObject* pool; - RFX_CONTEXT_PRIV* priv; + RFX_CONTEXT* context = NULL; + wObject* pool = NULL; + RFX_CONTEXT_PRIV* priv = NULL; context = (RFX_CONTEXT*)winpr_aligned_calloc(1, sizeof(RFX_CONTEXT), 32); if (!context) @@ -350,7 +350,7 @@ fail: void rfx_context_free(RFX_CONTEXT* context) { - RFX_CONTEXT_PRIV* priv; + RFX_CONTEXT_PRIV* priv = NULL; if (!context) return; @@ -455,7 +455,7 @@ BOOL rfx_context_reset(RFX_CONTEXT* context, UINT32 width, UINT32 height) static BOOL rfx_process_message_sync(RFX_CONTEXT* context, wStream* s) { - UINT32 magic; + UINT32 magic = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -487,7 +487,7 @@ static BOOL rfx_process_message_sync(RFX_CONTEXT* context, wStream* s) static BOOL rfx_process_message_codec_versions(RFX_CONTEXT* context, wStream* s) { - BYTE numCodecs; + BYTE numCodecs = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -530,8 +530,8 @@ static BOOL rfx_process_message_codec_versions(RFX_CONTEXT* context, wStream* s) static BOOL rfx_process_message_channels(RFX_CONTEXT* context, wStream* s) { - BYTE channelId; - BYTE numChannels; + BYTE channelId = 0; + BYTE numChannels = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -586,9 +586,9 @@ static BOOL rfx_process_message_channels(RFX_CONTEXT* context, wStream* s) static BOOL rfx_process_message_context(RFX_CONTEXT* context, wStream* s) { - BYTE ctxId; - UINT16 tileSize; - UINT16 properties; + BYTE ctxId = 0; + UINT16 tileSize = 0; + UINT16 properties = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -639,8 +639,8 @@ static BOOL rfx_process_message_context(RFX_CONTEXT* context, wStream* s) static BOOL rfx_process_message_frame_begin(RFX_CONTEXT* context, RFX_MESSAGE* message, wStream* s, UINT16* pExpectedBlockType) { - UINT32 frameIdx; - UINT16 numRegions; + UINT32 frameIdx = 0; + UINT16 numRegions = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -702,9 +702,9 @@ static BOOL rfx_resize_rects(RFX_MESSAGE* message) static BOOL rfx_process_message_region(RFX_CONTEXT* context, RFX_MESSAGE* message, wStream* s, UINT16* pExpectedBlockType) { - UINT16 i; - UINT16 regionType; - UINT16 numTileSets; + UINT16 i = 0; + UINT16 regionType = 0; + UINT16 numTileSets = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -823,19 +823,19 @@ static BOOL rfx_allocate_tiles(RFX_MESSAGE* message, size_t count, BOOL allocOnl static BOOL rfx_process_message_tileset(RFX_CONTEXT* context, RFX_MESSAGE* message, wStream* s, UINT16* pExpectedBlockType) { - BOOL rc; + BOOL rc = 0; size_t close_cnt = 0; - BYTE quant; - RFX_TILE* tile; - UINT32* quants; - UINT16 subtype; - UINT16 numTiles; - UINT32 blockLen; - UINT32 blockType; - UINT32 tilesDataSize; + BYTE quant = 0; + RFX_TILE* tile = NULL; + UINT32* quants = NULL; + UINT16 subtype = 0; + UINT16 numTiles = 0; + UINT32 blockLen = 0; + UINT32 blockType = 0; + UINT32 tilesDataSize = 0; PTP_WORK* work_objects = NULL; RFX_TILE_PROCESS_WORK_PARAM* params = NULL; - void* pmem; + void* pmem = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -956,7 +956,7 @@ static BOOL rfx_process_message_tileset(RFX_CONTEXT* context, RFX_MESSAGE* messa for (size_t i = 0; i < message->numTiles; i++) { wStream subBuffer; - wStream* sub; + wStream* sub = NULL; if (!(tile = (RFX_TILE*)ObjectPool_Take(context->priv->TilePool))) { @@ -1585,7 +1585,7 @@ static BOOL setupWorkers(RFX_CONTEXT* context, size_t nbTiles) RFX_CONTEXT_PRIV* priv = context->priv; WINPR_ASSERT(priv); - void* pmem; + void* pmem = NULL; if (!context->priv->UseThreads) return TRUE; @@ -2322,7 +2322,7 @@ static INLINE BOOL rfx_write_progressive_frame_end(RFX_CONTEXT* rfx, wStream* s) static INLINE BOOL rfx_write_progressive_tile_simple(RFX_CONTEXT* rfx, wStream* s, const RFX_TILE* tile) { - UINT32 blockLen; + UINT32 blockLen = 0; WINPR_ASSERT(rfx); WINPR_ASSERT(s); WINPR_ASSERT(tile); diff --git a/libfreerdp/codec/rfx_decode.c b/libfreerdp/codec/rfx_decode.c index f07ddaca0..4aa3c3def 100644 --- a/libfreerdp/codec/rfx_decode.c +++ b/libfreerdp/codec/rfx_decode.c @@ -40,7 +40,7 @@ void rfx_decode_component(RFX_CONTEXT* WINPR_RESTRICT context, const BYTE* WINPR_RESTRICT data, size_t size, INT16* WINPR_RESTRICT buffer) { - INT16* dwt_buffer; + INT16* dwt_buffer = NULL; dwt_buffer = BufferPool_Take(context->priv->BufferPool, -1); /* dwt_buffer */ PROFILER_ENTER(context->priv->prof_rfx_decode_component) PROFILER_ENTER(context->priv->prof_rfx_rlgr_decode) @@ -70,11 +70,11 @@ BOOL rfx_decode_rgb(RFX_CONTEXT* context, const RFX_TILE* tile, BYTE* rgb_buffer INT16** pv; } cnv; BOOL rc = TRUE; - BYTE* pBuffer; + BYTE* pBuffer = NULL; INT16* pSrcDst[3]; - UINT32* y_quants; - UINT32* cb_quants; - UINT32* cr_quants; + UINT32* y_quants = NULL; + UINT32* cb_quants = NULL; + UINT32* cr_quants = NULL; static const prim_size_t roi_64x64 = { 64, 64 }; const primitives_t* prims = primitives_get(); PROFILER_ENTER(context->priv->prof_rfx_decode_rgb) diff --git a/libfreerdp/codec/rfx_dwt.c b/libfreerdp/codec/rfx_dwt.c index caceb813d..31dc83985 100644 --- a/libfreerdp/codec/rfx_dwt.c +++ b/libfreerdp/codec/rfx_dwt.c @@ -27,15 +27,15 @@ static void rfx_dwt_2d_decode_block(INT16* buffer, INT16* idwt, size_t subband_width) { - INT16* dst; - INT16* l; - INT16* h; - INT16* l_dst; - INT16* h_dst; - INT16* hl; - INT16* lh; - INT16* hh; - INT16* ll; + INT16* dst = NULL; + INT16* l = NULL; + INT16* h = NULL; + INT16* l_dst = NULL; + INT16* h_dst = NULL; + INT16* hl = NULL; + INT16* lh = NULL; + INT16* hh = NULL; + INT16* ll = NULL; const size_t total_width = subband_width << 1; @@ -126,15 +126,15 @@ void rfx_dwt_2d_decode(INT16* buffer, INT16* dwt_buffer) static void rfx_dwt_2d_encode_block(INT16* buffer, INT16* dwt, UINT32 subband_width) { - INT16* src; - INT16* l; - INT16* h; - INT16* l_src; - INT16* h_src; - INT16* hl; - INT16* lh; - INT16* hh; - INT16* ll; + INT16* src = NULL; + INT16* l = NULL; + INT16* h = NULL; + INT16* l_src = NULL; + INT16* h_src = NULL; + INT16* hl = NULL; + INT16* lh = NULL; + INT16* hh = NULL; + INT16* ll = NULL; const UINT32 total_width = subband_width << 1; diff --git a/libfreerdp/codec/rfx_encode.c b/libfreerdp/codec/rfx_encode.c index dc7866004..5aeb60e0a 100644 --- a/libfreerdp/codec/rfx_encode.c +++ b/libfreerdp/codec/rfx_encode.c @@ -43,19 +43,19 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i UINT32 pixel_format, const BYTE* palette, INT16* r_buf, INT16* g_buf, INT16* b_buf) { - int x; - int y; - int x_exceed; - int y_exceed; - const BYTE* src; - const UINT32* src_32; - const UINT16* src_16; - INT16 r; - INT16 g; - INT16 b; - INT16* r_last; - INT16* g_last; - INT16* b_last; + int x = 0; + int y = 0; + int x_exceed = 0; + int y_exceed = 0; + const BYTE* src = NULL; + const UINT32* src_32 = NULL; + const UINT16* src_16 = NULL; + INT16 r = 0; + INT16 g = 0; + INT16 b = 0; + INT16* r_last = NULL; + INT16* g_last = NULL; + INT16* b_last = NULL; x_exceed = 64 - width; y_exceed = 64 - height; @@ -161,8 +161,8 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i for (x = 0; x < width; x++) { - int shift; - BYTE idx; + int shift = 0; + BYTE idx = 0; shift = (7 - (x % 8)); idx = ((*src) >> shift) & 1; idx |= (((*(src + 1)) >> shift) & 1) << 1; @@ -240,7 +240,7 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i static void rfx_encode_component(RFX_CONTEXT* context, const UINT32* quantization_values, INT16* data, BYTE* buffer, int buffer_size, int* size) { - INT16* dwt_buffer; + INT16* dwt_buffer = NULL; dwt_buffer = BufferPool_Take(context->priv->BufferPool, -1); /* dwt_buffer */ PROFILER_ENTER(context->priv->prof_rfx_encode_component) PROFILER_ENTER(context->priv->prof_rfx_dwt_2d_encode) @@ -266,14 +266,14 @@ void rfx_encode_rgb(RFX_CONTEXT* context, RFX_TILE* tile) const INT16** cpv; INT16** pv; } cnv; - BYTE* pBuffer; + BYTE* pBuffer = NULL; INT16* pSrcDst[3]; - int YLen; - int CbLen; - int CrLen; - UINT32* YQuant; - UINT32* CbQuant; - UINT32* CrQuant; + int YLen = 0; + int CbLen = 0; + int CrLen = 0; + UINT32* YQuant = NULL; + UINT32* CbQuant = NULL; + UINT32* CrQuant = NULL; primitives_t* prims = primitives_get(); static const prim_size_t roi_64x64 = { 64, 64 }; diff --git a/libfreerdp/codec/rfx_quantization.c b/libfreerdp/codec/rfx_quantization.c index 81d859096..97bd50d1e 100644 --- a/libfreerdp/codec/rfx_quantization.c +++ b/libfreerdp/codec/rfx_quantization.c @@ -70,8 +70,8 @@ void rfx_quantization_decode(INT16* buffer, const UINT32* WINPR_RESTRICT quantVa static void rfx_quantization_encode_block(INT16* buffer, size_t buffer_size, UINT32 factor) { - INT16* dst; - INT16 half; + INT16* dst = NULL; + INT16 half = 0; if (factor == 0) return; diff --git a/libfreerdp/codec/rfx_rlgr.c b/libfreerdp/codec/rfx_rlgr.c index be75a5720..da1b63f93 100644 --- a/libfreerdp/codec/rfx_rlgr.c +++ b/libfreerdp/codec/rfx_rlgr.c @@ -91,7 +91,7 @@ static INLINE UINT32 lzcnt_s(UINT32 x) if (!g_LZCNT) { - UINT32 y; + UINT32 y = 0; UINT32 n = 32; y = x >> 16; if (y != 0) @@ -632,11 +632,11 @@ static void rfx_rlgr_code_gr(RFX_BITSTREAM* bs, int* krp, UINT32 val) int rfx_rlgr_encode(RLGR_MODE mode, const INT16* WINPR_RESTRICT data, UINT32 data_size, BYTE* WINPR_RESTRICT buffer, UINT32 buffer_size) { - int k; - int kp; - int krp; - RFX_BITSTREAM* bs; - int processed_size; + int k = 0; + int kp = 0; + int krp = 0; + RFX_BITSTREAM* bs = NULL; + int processed_size = 0; if (!(bs = (RFX_BITSTREAM*)winpr_aligned_calloc(1, sizeof(RFX_BITSTREAM), 32))) return 0; @@ -651,13 +651,13 @@ int rfx_rlgr_encode(RLGR_MODE mode, const INT16* WINPR_RESTRICT data, UINT32 dat /* process all the input coefficients */ while (data_size > 0) { - int input; + int input = 0; if (k) { - int numZeros; - int runmax; - int sign; + int numZeros = 0; + int runmax = 0; + int sign = 0; /* RUN-LENGTH MODE */ @@ -705,7 +705,7 @@ int rfx_rlgr_encode(RLGR_MODE mode, const INT16* WINPR_RESTRICT data, UINT32 dat if (mode == RLGR1) { - UINT32 twoMs; + UINT32 twoMs = 0; /* RLGR1 variant */ @@ -728,10 +728,10 @@ int rfx_rlgr_encode(RLGR_MODE mode, const INT16* WINPR_RESTRICT data, UINT32 dat } else /* mode == RLGR3 */ { - UINT32 twoMs1; - UINT32 twoMs2; - UINT32 sum2Ms; - UINT32 nIdx; + UINT32 twoMs1 = 0; + UINT32 twoMs2 = 0; + UINT32 sum2Ms = 0; + UINT32 nIdx = 0; /* RLGR3 variant */ diff --git a/libfreerdp/codec/rfx_sse2.c b/libfreerdp/codec/rfx_sse2.c index 301855c7a..b668b119e 100644 --- a/libfreerdp/codec/rfx_sse2.c +++ b/libfreerdp/codec/rfx_sse2.c @@ -52,7 +52,7 @@ static __inline void __attribute__((ATTRIBUTES)) _mm_prefetch_buffer(char* buffer, int num_bytes) { __m128i* buf = (__m128i*)buffer; - unsigned int i; + unsigned int i = 0; for (i = 0; i < (num_bytes / sizeof(__m128i)); i += (CACHE_LINE_BYTES / sizeof(__m128i))) { @@ -146,13 +146,13 @@ static void rfx_quantization_encode_sse2(INT16* buffer, static __inline void __attribute__((ATTRIBUTES)) rfx_dwt_2d_decode_block_horiz_sse2(INT16* l, INT16* h, INT16* dst, int subband_width) { - int y; - int n; + int y = 0; + int n = 0; INT16* l_ptr = l; INT16* h_ptr = h; INT16* dst_ptr = dst; - int first; - int last; + int first = 0; + int last = 0; __m128i l_n; __m128i h_n; __m128i h_n_m; @@ -222,8 +222,8 @@ rfx_dwt_2d_decode_block_horiz_sse2(INT16* l, INT16* h, INT16* dst, int subband_w static __inline void __attribute__((ATTRIBUTES)) rfx_dwt_2d_decode_block_vert_sse2(INT16* l, INT16* h, INT16* dst, int subband_width) { - int x; - int n; + int x = 0; + int n = 0; INT16* l_ptr = l; INT16* h_ptr = h; INT16* dst_ptr = dst; @@ -301,12 +301,12 @@ rfx_dwt_2d_decode_block_vert_sse2(INT16* l, INT16* h, INT16* dst, int subband_wi static __inline void __attribute__((ATTRIBUTES)) rfx_dwt_2d_decode_block_sse2(INT16* buffer, INT16* idwt, int subband_width) { - INT16* hl; - INT16* lh; - INT16* hh; - INT16* ll; - INT16* l_dst; - INT16* h_dst; + INT16* hl = NULL; + INT16* lh = NULL; + INT16* hh = NULL; + INT16* ll = NULL; + INT16* l_dst = NULL; + INT16* h_dst = NULL; _mm_prefetch_buffer((char*)idwt, subband_width * 4 * sizeof(INT16)); /* Inverse DWT in horizontal direction, results in 2 sub-bands in L, H order in tmp buffer idwt. */ @@ -339,9 +339,9 @@ static void rfx_dwt_2d_decode_sse2(INT16* buffer, INT16* dwt_buffer) static __inline void __attribute__((ATTRIBUTES)) rfx_dwt_2d_encode_block_vert_sse2(INT16* src, INT16* l, INT16* h, int subband_width) { - int total_width; - int x; - int n; + int total_width = 0; + int x = 0; + int n = 0; __m128i src_2n; __m128i src_2n_1; __m128i src_2n_2; @@ -391,9 +391,9 @@ rfx_dwt_2d_encode_block_vert_sse2(INT16* src, INT16* l, INT16* h, int subband_wi static __inline void __attribute__((ATTRIBUTES)) rfx_dwt_2d_encode_block_horiz_sse2(INT16* src, INT16* l, INT16* h, int subband_width) { - int y; - int n; - int first; + int y = 0; + int n = 0; + int first = 0; __m128i src_2n; __m128i src_2n_1; __m128i src_2n_2; @@ -442,12 +442,12 @@ rfx_dwt_2d_encode_block_horiz_sse2(INT16* src, INT16* l, INT16* h, int subband_w static __inline void __attribute__((ATTRIBUTES)) rfx_dwt_2d_encode_block_sse2(INT16* buffer, INT16* dwt, int subband_width) { - INT16* hl; - INT16* lh; - INT16* hh; - INT16* ll; - INT16* l_src; - INT16* h_src; + INT16* hl = NULL; + INT16* lh = NULL; + INT16* hh = NULL; + INT16* ll = NULL; + INT16* l_src = NULL; + INT16* h_src = NULL; _mm_prefetch_buffer((char*)dwt, subband_width * 4 * sizeof(INT16)); /* DWT in vertical direction, results in 2 sub-bands in L, H order in tmp buffer dwt. */ l_src = dwt; diff --git a/libfreerdp/codec/test/TestFreeRDPCodecClear.c b/libfreerdp/codec/test/TestFreeRDPCodecClear.c index 4317690be..ee4bc3b1b 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecClear.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecClear.c @@ -50,7 +50,7 @@ static BOOL test_ClearDecompressExample(UINT32 nr, UINT32 width, UINT32 height, const BYTE* pSrcData, const UINT32 SrcSize) { BOOL rc = FALSE; - int status; + int status = 0; BYTE* pDstData = calloc(width * height, 4); CLEAR_CONTEXT* clear = clear_context_new(FALSE); diff --git a/libfreerdp/codec/test/TestFreeRDPCodecInterleaved.c b/libfreerdp/codec/test/TestFreeRDPCodecInterleaved.c index 722437c52..17631d047 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecInterleaved.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecInterleaved.c @@ -22,9 +22,9 @@ static BOOL run_encode_decode_single(UINT16 bpp, BITMAP_INTERLEAVED_CONTEXT* enc ) { BOOL rc2 = FALSE; - BOOL rc; - UINT32 i; - UINT32 j; + BOOL rc = 0; + UINT32 i = 0; + UINT32 j = 0; const UINT32 w = 64; const UINT32 h = 64; const UINT32 x = 0; @@ -70,12 +70,12 @@ static BOOL run_encode_decode_single(UINT16 bpp, BITMAP_INTERLEAVED_CONTEXT* enc for (j = 0; j < w; j++) { - BYTE r; - BYTE g; - BYTE b; - BYTE dr; - BYTE dg; - BYTE db; + BYTE r = 0; + BYTE g = 0; + BYTE b = 0; + BYTE dr = 0; + BYTE dg = 0; + BYTE db = 0; const UINT32 srcColor = FreeRDPReadColor(&srcLine[j * bstep], format); const UINT32 dstColor = FreeRDPReadColor(&dstLine[j * bstep], format); FreeRDPSplitColor(srcColor, format, &r, &g, &b, NULL, NULL); @@ -131,7 +131,7 @@ static BOOL run_encode_decode(UINT16 bpp, BITMAP_INTERLEAVED_CONTEXT* encoder, BITMAP_INTERLEAVED_CONTEXT* decoder) { BOOL rc = FALSE; - UINT32 x; + UINT32 x = 0; PROFILER_DEFINE(profiler_comp) PROFILER_DEFINE(profiler_decomp) PROFILER_CREATE(profiler_comp, get_profiler_name(TRUE, bpp)) @@ -163,7 +163,7 @@ static BOOL TestColorConversion(void) { const UINT32 formats[] = { PIXEL_FORMAT_RGB15, PIXEL_FORMAT_BGR15, PIXEL_FORMAT_ABGR15, PIXEL_FORMAT_ARGB15, PIXEL_FORMAT_BGR16, PIXEL_FORMAT_RGB16 }; - UINT32 x; + UINT32 x = 0; /* Check color conversion 15/16 -> 32bit maps to proper values */ for (x = 0; x < ARRAYSIZE(formats); x++) @@ -174,10 +174,10 @@ static BOOL TestColorConversion(void) const UINT32 colorHigh = FreeRDPGetColor(format, 255, 255, 255, 255); const UINT32 colorLow32 = FreeRDPConvertColor(colorLow, format, dstFormat, NULL); const UINT32 colorHigh32 = FreeRDPConvertColor(colorHigh, format, dstFormat, NULL); - BYTE r; - BYTE g; - BYTE b; - BYTE a; + BYTE r = 0; + BYTE g = 0; + BYTE b = 0; + BYTE a = 0; FreeRDPSplitColor(colorLow32, dstFormat, &r, &g, &b, &a, NULL); if ((r != 0) || (g != 0) || (b != 0)) return FALSE; @@ -192,8 +192,8 @@ static BOOL TestColorConversion(void) int TestFreeRDPCodecInterleaved(int argc, char* argv[]) { - BITMAP_INTERLEAVED_CONTEXT* encoder; - BITMAP_INTERLEAVED_CONTEXT* decoder; + BITMAP_INTERLEAVED_CONTEXT* encoder = NULL; + BITMAP_INTERLEAVED_CONTEXT* decoder = NULL; int rc = -1; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/libfreerdp/codec/test/TestFreeRDPCodecMppc.c b/libfreerdp/codec/test/TestFreeRDPCodecMppc.c index 9c2df9496..b0d70d7a6 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecMppc.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecMppc.c @@ -738,8 +738,8 @@ static const BYTE TEST_ISLAND_DATA_RDP5[] = static int test_MppcCompressBellsRdp5(void) { int rc = -1; - int status; - UINT32 Flags; + int status = 0; + UINT32 Flags = 0; BYTE OutputBuffer[65536] = { 0 }; const UINT32 SrcSize = sizeof(TEST_MPPC_BELLS) - 1; const BYTE* pSrcData = (const BYTE*)TEST_MPPC_BELLS; @@ -786,8 +786,8 @@ fail: static int test_MppcCompressBellsRdp4(void) { int rc = -1; - int status; - UINT32 Flags; + int status = 0; + UINT32 Flags = 0; BYTE OutputBuffer[65536] = { 0 }; const BYTE* pSrcData = (const BYTE*)TEST_MPPC_BELLS; const UINT32 SrcSize = sizeof(TEST_MPPC_BELLS) - 1; @@ -833,13 +833,13 @@ fail: static int test_MppcDecompressBellsRdp5(void) { int rc = -1; - int status; - UINT32 Flags; - const BYTE* pSrcData; - UINT32 SrcSize; - UINT32 DstSize; - MPPC_CONTEXT* mppc; - UINT32 expectedSize; + int status = 0; + UINT32 Flags = 0; + const BYTE* pSrcData = NULL; + UINT32 SrcSize = 0; + UINT32 DstSize = 0; + MPPC_CONTEXT* mppc = NULL; + UINT32 expectedSize = 0; const BYTE* pDstData = NULL; mppc = mppc_context_new(1, FALSE); @@ -880,13 +880,13 @@ fail: static int test_MppcDecompressBellsRdp4(void) { int rc = -1; - int status; - UINT32 Flags; - const BYTE* pSrcData; - UINT32 SrcSize; - UINT32 DstSize; - MPPC_CONTEXT* mppc; - UINT32 expectedSize; + int status = 0; + UINT32 Flags = 0; + const BYTE* pSrcData = NULL; + UINT32 SrcSize = 0; + UINT32 DstSize = 0; + MPPC_CONTEXT* mppc = NULL; + UINT32 expectedSize = 0; const BYTE* pDstData = NULL; mppc = mppc_context_new(0, FALSE); @@ -927,8 +927,8 @@ fail: static int test_MppcCompressIslandRdp5(void) { int rc = -1; - int status; - UINT32 Flags; + int status = 0; + UINT32 Flags = 0; BYTE OutputBuffer[65536] = { 0 }; const UINT32 SrcSize = sizeof(TEST_ISLAND_DATA) - 1; const BYTE* pSrcData = (const BYTE*)TEST_ISLAND_DATA; @@ -974,8 +974,8 @@ fail: static int test_MppcCompressBufferRdp5(void) { int rc = -1; - int status; - UINT32 Flags; + int status = 0; + UINT32 Flags = 0; BYTE OutputBuffer[65536] = { 0 }; const UINT32 SrcSize = sizeof(TEST_RDP5_UNCOMPRESSED_DATA); const BYTE* pSrcData = (const BYTE*)TEST_RDP5_UNCOMPRESSED_DATA; @@ -1019,13 +1019,13 @@ fail: static int test_MppcDecompressBufferRdp5(void) { int rc = -1; - int status; - UINT32 Flags; - const BYTE* pSrcData; - UINT32 SrcSize; - UINT32 DstSize; - MPPC_CONTEXT* mppc; - UINT32 expectedSize; + int status = 0; + UINT32 Flags = 0; + const BYTE* pSrcData = NULL; + UINT32 SrcSize = 0; + UINT32 DstSize = 0; + MPPC_CONTEXT* mppc = NULL; + UINT32 expectedSize = 0; const BYTE* pDstData = NULL; mppc = mppc_context_new(1, FALSE); diff --git a/libfreerdp/codec/test/TestFreeRDPCodecNCrush.c b/libfreerdp/codec/test/TestFreeRDPCodecNCrush.c index 68995a501..689b3787e 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecNCrush.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecNCrush.c @@ -13,8 +13,8 @@ static const BYTE TEST_BELLS_NCRUSH[] = static BOOL test_NCrushCompressBells(void) { BOOL rc = FALSE; - int status; - UINT32 Flags; + int status = 0; + UINT32 Flags = 0; const BYTE* pDstData = NULL; BYTE OutputBuffer[65536] = { 0 }; const UINT32 SrcSize = sizeof(TEST_BELLS_DATA) - 1; @@ -64,12 +64,12 @@ fail: static BOOL test_NCrushDecompressBells(void) { BOOL rc = FALSE; - int status; - UINT32 Flags; - const BYTE* pSrcData; - UINT32 SrcSize; - UINT32 DstSize; - UINT32 expectedSize; + int status = 0; + UINT32 Flags = 0; + const BYTE* pSrcData = NULL; + UINT32 SrcSize = 0; + UINT32 DstSize = 0; + UINT32 expectedSize = 0; const BYTE* pDstData = NULL; NCRUSH_CONTEXT* ncrush = ncrush_context_new(FALSE); diff --git a/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c b/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c index e6dee20a8..05fbef569 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c @@ -5423,12 +5423,12 @@ static const UINT32 colorFormatCount = sizeof(colorFormatList) / sizeof(colorFor static BOOL CompareBitmap(const BYTE* srcA, UINT32 srcAFormat, const BYTE* srcB, UINT32 srcBFormat, UINT32 width, UINT32 height) { - double maxDiff; + double maxDiff = NAN; const UINT32 srcABits = FreeRDPGetBitsPerPixel(srcAFormat); const UINT32 srcBBits = FreeRDPGetBitsPerPixel(srcBFormat); UINT32 diff = fabs((double)srcABits - srcBBits); - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; /* No support for 8bpp */ if ((srcABits < 15) || (srcBBits < 15)) @@ -5470,14 +5470,14 @@ static BOOL CompareBitmap(const BYTE* srcA, UINT32 srcAFormat, const BYTE* srcB, for (x = 0; x < width; x++) { - BYTE sR; - BYTE sG; - BYTE sB; - BYTE sA; - BYTE dR; - BYTE dG; - BYTE dB; - BYTE dA; + BYTE sR = 0; + BYTE sG = 0; + BYTE sB = 0; + BYTE sA = 0; + BYTE dR = 0; + BYTE dG = 0; + BYTE dB = 0; + BYTE dA = 0; const BYTE* a = &lineA[x * FreeRDPGetBytesPerPixel(srcAFormat)]; const BYTE* b = &lineB[x * FreeRDPGetBytesPerPixel(srcBFormat)]; UINT32 colorA = FreeRDPReadColor(a, srcAFormat); @@ -5507,7 +5507,7 @@ static BOOL RunTestPlanar(BITMAP_PLANAR_CONTEXT* planar, const BYTE* srcBitmap, const UINT32 height) { BOOL rc = FALSE; - UINT32 dstSize; + UINT32 dstSize = 0; BYTE* compressedBitmap = freerdp_bitmap_compress_planar(planar, srcBitmap, srcFormat, width, height, 0, NULL, &dstSize); BYTE* decompressedBitmap = (BYTE*)calloc(height, width * FreeRDPGetBytesPerPixel(dstFormat)); @@ -5549,10 +5549,10 @@ fail: static BOOL RunTestPlanarSingleColor(BITMAP_PLANAR_CONTEXT* planar, const UINT32 srcFormat, const UINT32 dstFormat) { - UINT32 i; - UINT32 j; - UINT32 x; - UINT32 y; + UINT32 i = 0; + UINT32 j = 0; + UINT32 x = 0; + UINT32 y = 0; BOOL rc = FALSE; printf("%s: [%s] --> [%s]: ", __func__, FreeRDPGetColorFormatName(srcFormat), FreeRDPGetColorFormatName(dstFormat)); @@ -5562,7 +5562,7 @@ static BOOL RunTestPlanarSingleColor(BITMAP_PLANAR_CONTEXT* planar, const UINT32 { for (i = 4; i < 32; i += 8) { - UINT32 compressedSize; + UINT32 compressedSize = 0; const UINT32 fill = j; const UINT32 color = FreeRDPGetColor(srcFormat, (fill >> 8) & 0xF, (fill >> 4) & 0xF, (fill)&0xF, 0xFF); @@ -5626,7 +5626,7 @@ fail: static BOOL TestPlanar(const UINT32 format) { - UINT32 x; + UINT32 x = 0; BOOL rc = FALSE; const DWORD planarFlags = PLANAR_FORMAT_HEADER_NA | PLANAR_FORMAT_HEADER_RLE; BITMAP_PLANAR_CONTEXT* planar = freerdp_bitmap_planar_context_new(planarFlags, 64, 64); @@ -5664,7 +5664,7 @@ fail: static UINT32 prand(UINT32 max) { - UINT32 tmp; + UINT32 tmp = 0; if (max <= 1) return 1; winpr_RAND(&tmp, sizeof(tmp)); @@ -5673,7 +5673,7 @@ static UINT32 prand(UINT32 max) static BOOL FuzzPlanar(void) { - UINT32 x; + UINT32 x = 0; BOOL rc = FALSE; const DWORD planarFlags = PLANAR_FORMAT_HEADER_NA | PLANAR_FORMAT_HEADER_RLE; BITMAP_PLANAR_CONTEXT* planar = freerdp_bitmap_planar_context_new(planarFlags, 64, 64); @@ -5688,11 +5688,11 @@ static BOOL FuzzPlanar(void) BYTE dstData[0x10000] = { 0 }; UINT32 DstFormat = 0; - UINT32 nDstStep; - UINT32 nXDst; - UINT32 nYDst; - UINT32 nDstWidth; - UINT32 nDstHeight; + UINT32 nDstStep = 0; + UINT32 nXDst = 0; + UINT32 nYDst = 0; + UINT32 nDstWidth = 0; + UINT32 nDstHeight = 0; BOOL invalid = TRUE; do { @@ -5777,7 +5777,7 @@ fail: int TestFreeRDPCodecPlanar(int argc, char* argv[]) { - UINT32 x; + UINT32 x = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c index 6fde846dc..8ff575f30 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c @@ -151,9 +151,9 @@ static void sample_file_free(EGFX_SAMPLE_FILE* file) static void test_fill_image_alpha_channel(BYTE* data, int width, int height, BYTE value) { - int i; - int j; - UINT32* pixel; + int i = 0; + int j = 0; + UINT32* pixel = NULL; for (i = 0; i < height; i++) { @@ -178,8 +178,8 @@ static void* test_image_memset32(UINT32* ptr, UINT32 fill, size_t length) static int test_image_fill(BYTE* pDstData, int nDstStep, int nXDst, int nYDst, int nWidth, int nHeight, UINT32 color) { - int y; - UINT32* pDstPixel; + int y = 0; + UINT32* pDstPixel = NULL; if (nDstStep < 0) nDstStep = 4 * nWidth; @@ -537,10 +537,10 @@ static int test_progressive_load_files(char* ms_sample_path, EGFX_SAMPLE_FILE fi static BYTE* test_progressive_load_bitmap(char* path, char* file, size_t* size, int quarter) { - int status; - BYTE* buffer; - wImage* image; - char* filename; + int status = 0; + BYTE* buffer = NULL; + wImage* image = NULL; + char* filename = NULL; filename = GetCombinedPath(path, file); if (!filename) @@ -818,8 +818,8 @@ static size_t test_memcmp_count(const BYTE* mem1, const BYTE* mem2, size_t size, static int test_progressive_decode(PROGRESSIVE_CONTEXT* progressive, EGFX_SAMPLE_FILE files[4], EGFX_SAMPLE_FILE bitmaps[4], int quarter, int count) { - int nXSrc; - int nYSrc; + int nXSrc = 0; + int nYSrc = 0; RECTANGLE_16 clippingRect = { 0 }; clippingRect.right = g_Width; @@ -905,14 +905,14 @@ static int test_progressive_decode(PROGRESSIVE_CONTEXT* progressive, EGFX_SAMPLE static int test_progressive_ms_sample(char* ms_sample_path) { - int i; - int j; - int k; - int count; - int status; + int i = 0; + int j = 0; + int k = 0; + int count = 0; + int status = 0; EGFX_SAMPLE_FILE files[3][4][4] = { 0 }; EGFX_SAMPLE_FILE bitmaps[3][4][4] = { 0 }; - PROGRESSIVE_CONTEXT* progressive; + PROGRESSIVE_CONTEXT* progressive = NULL; g_Width = 1920; g_Height = 1080; g_DstStep = g_Width * 4; @@ -1018,14 +1018,14 @@ static BOOL diff(BYTE a, BYTE b) static BOOL colordiff(UINT32 format, UINT32 a, UINT32 b) { - BYTE ar; - BYTE ag; - BYTE ab; - BYTE aa; - BYTE br; - BYTE bg; - BYTE bb; - BYTE ba; + BYTE ar = 0; + BYTE ag = 0; + BYTE ab = 0; + BYTE aa = 0; + BYTE br = 0; + BYTE bg = 0; + BYTE bb = 0; + BYTE ba = 0; FreeRDPSplitColor(a, format, &ar, &ag, &ab, &aa, NULL); FreeRDPSplitColor(b, format, &br, &bg, &bb, &ba, NULL); if (!diff(aa, ba) || !diff(ar, br) || !diff(ag, bg) || !diff(ab, bb)) @@ -1036,7 +1036,7 @@ static BOOL colordiff(UINT32 format, UINT32 a, UINT32 b) static BOOL test_encode_decode(const char* path) { BOOL res = FALSE; - int rc; + int rc = 0; BYTE* resultData = NULL; BYTE* dstData = NULL; UINT32 dstSize = 0; @@ -1116,7 +1116,7 @@ fail: int TestFreeRDPCodecProgressive(int argc, char* argv[]) { int rc = -1; - char* ms_sample_path; + char* ms_sample_path = NULL; char name[8192]; SYSTEMTIME systemTime; WINPR_UNUSED(argc); diff --git a/libfreerdp/codec/test/TestFreeRDPCodecRemoteFX.c b/libfreerdp/codec/test/TestFreeRDPCodecRemoteFX.c index 4c430fd56..f15c07533 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecRemoteFX.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecRemoteFX.c @@ -809,7 +809,7 @@ static INLINE size_t fuzzyCompare(BYTE b1, BYTE b2) static BOOL fuzzyCompareImage(const UINT32* crefImage, const BYTE* img, size_t npixels) { - size_t i; + size_t i = 0; size_t totalDelta = 0; for (i = 0; i < npixels; i++, crefImage++) @@ -818,7 +818,7 @@ static BOOL fuzzyCompareImage(const UINT32* crefImage, const BYTE* img, size_t n BYTE R = *img++; BYTE G = *img++; BYTE B = *img++; - size_t delta; + size_t delta = 0; if (A != 0x00) return FALSE; diff --git a/libfreerdp/codec/test/TestFreeRDPCodecXCrush.c b/libfreerdp/codec/test/TestFreeRDPCodecXCrush.c index 3df4721ae..f7abfb1e7 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecXCrush.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecXCrush.c @@ -114,7 +114,7 @@ static const struct test_argument tests[] = { int TestFreeRDPCodecXCrush(int argc, char* argv[]) { int rc = 0; - size_t x; + size_t x = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/libfreerdp/codec/test/TestFreeRDPCodecZGfx.c b/libfreerdp/codec/test/TestFreeRDPCodecZGfx.c index 9733a09dc..68db553dd 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecZGfx.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecZGfx.c @@ -26,14 +26,14 @@ static const BYTE TEST_FOX_DATA_MULTIPART[] = static int test_ZGfxCompressFox(void) { int rc = -1; - int status; - UINT32 Flags; + int status = 0; + UINT32 Flags = 0; const BYTE* pSrcData = NULL; - UINT32 SrcSize; - UINT32 DstSize; + UINT32 SrcSize = 0; + UINT32 DstSize = 0; BYTE* pDstData = NULL; - ZGFX_CONTEXT* zgfx; - UINT32 expectedSize; + ZGFX_CONTEXT* zgfx = NULL; + UINT32 expectedSize = 0; zgfx = zgfx_context_new(TRUE); if (!zgfx) @@ -78,14 +78,14 @@ fail: static int test_ZGfxDecompressFoxSingle(void) { int rc = -1; - int status; - UINT32 Flags; - const BYTE* pSrcData; - UINT32 SrcSize; - UINT32 DstSize; + int status = 0; + UINT32 Flags = 0; + const BYTE* pSrcData = NULL; + UINT32 SrcSize = 0; + UINT32 DstSize = 0; BYTE* pDstData = NULL; - ZGFX_CONTEXT* zgfx; - UINT32 expectedSize; + ZGFX_CONTEXT* zgfx = NULL; + UINT32 expectedSize = 0; zgfx = zgfx_context_new(TRUE); if (!zgfx) @@ -130,14 +130,14 @@ fail: static int test_ZGfxDecompressFoxMultipart(void) { int rc = -1; - int status; - UINT32 Flags; - const BYTE* pSrcData; - UINT32 SrcSize; - UINT32 DstSize; + int status = 0; + UINT32 Flags = 0; + const BYTE* pSrcData = NULL; + UINT32 SrcSize = 0; + UINT32 DstSize = 0; BYTE* pDstData = NULL; - ZGFX_CONTEXT* zgfx; - UINT32 expectedSize; + ZGFX_CONTEXT* zgfx = NULL; + UINT32 expectedSize = 0; zgfx = zgfx_context_new(TRUE); if (!zgfx) @@ -182,17 +182,17 @@ fail: static int test_ZGfxCompressConsistent(void) { int rc = -1; - int status; + int status = 0; - UINT32 Flags; - const BYTE* pSrcData; - UINT32 SrcSize; - UINT32 DstSize; + UINT32 Flags = 0; + const BYTE* pSrcData = NULL; + UINT32 SrcSize = 0; + UINT32 DstSize = 0; BYTE* pDstData = NULL; - UINT32 DstSize2; + UINT32 DstSize2 = 0; BYTE* pDstData2 = NULL; - ZGFX_CONTEXT* zgfx; - UINT32 expectedSize; + ZGFX_CONTEXT* zgfx = NULL; + UINT32 expectedSize = 0; BYTE BigBuffer[65536]; memset(BigBuffer, 0xaa, sizeof(BigBuffer)); memcpy(BigBuffer, TEST_FOX_DATA, sizeof(TEST_FOX_DATA) - 1); diff --git a/libfreerdp/codec/test/TestFreeRDPRegion.c b/libfreerdp/codec/test/TestFreeRDPRegion.c index e055aa4de..625ee9760 100644 --- a/libfreerdp/codec/test/TestFreeRDPRegion.c +++ b/libfreerdp/codec/test/TestFreeRDPRegion.c @@ -24,7 +24,7 @@ static BOOL compareRectangles(const RECTANGLE_16* src1, const RECTANGLE_16* src2, int nb) { - int i; + int i = 0; for (i = 0; i < nb; i++, src1++, src2++) { @@ -46,8 +46,8 @@ static int test_basic(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects; - UINT32 nbRects; + const RECTANGLE_16* rects = NULL; + UINT32 nbRects = 0; /* R1 + R2 ==> disjointed rects */ RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r2 = { 150, 301, 250, 401 }; @@ -89,8 +89,8 @@ static int test_r1_r3(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects; - UINT32 nbRects; + const RECTANGLE_16* rects = NULL; + UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r3 = { 150, 151, 250, 251 }; RECTANGLE_16 r1_r3[] = { { 0, 101, 200, 151 }, { 0, 151, 250, 201 }, { 150, 201, 250, 251 } }; @@ -143,8 +143,8 @@ static int test_r9_r10(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects; - UINT32 nbRects; + const RECTANGLE_16* rects = NULL; + UINT32 nbRects = 0; /* * +=============================================================== * | @@ -188,8 +188,8 @@ static int test_r1_r5(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects; - UINT32 nbRects; + const RECTANGLE_16* rects = NULL; + UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r5 = { 150, 121, 300, 131 }; RECTANGLE_16 r1_r5[] = { { 0, 101, 200, 121 }, { 0, 121, 300, 131 }, { 0, 131, 200, 201 } }; @@ -229,8 +229,8 @@ static int test_r1_r6(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects; - UINT32 nbRects; + const RECTANGLE_16* rects = NULL; + UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r6 = { 150, 121, 170, 131 }; region16_init(®ion); @@ -269,8 +269,8 @@ static int test_r1_r2_r4(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects; - UINT32 nbRects; + const RECTANGLE_16* rects = NULL; + UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r2 = { 150, 301, 250, 401 }; RECTANGLE_16 r4 = { 150, 251, 250, 301 }; @@ -318,8 +318,8 @@ static int test_r1_r7_r8(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects; - UINT32 nbRects; + const RECTANGLE_16* rects = NULL; + UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r7 = { 300, 101, 500, 201 }; RECTANGLE_16 r8 = { 150, 121, 400, 131 }; @@ -397,8 +397,8 @@ static int test_r1_r2_r3_r4(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects; - UINT32 nbRects; + const RECTANGLE_16* rects = NULL; + UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r2 = { 150, 301, 250, 401 }; RECTANGLE_16 r3 = { 150, 151, 250, 251 }; @@ -479,8 +479,8 @@ static int test_from_weston(void) */ REGION16 region; int retCode = -1; - const RECTANGLE_16* rects; - UINT32 nbRects; + const RECTANGLE_16* rects = NULL; + UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 0, 640, 32 }; RECTANGLE_16 r2 = { 236, 169, 268, 201 }; RECTANGLE_16 r3 = { 246, 258, 278, 290 }; @@ -527,8 +527,8 @@ static int test_r1_inter_r3(void) REGION16 region; REGION16 intersection; int retCode = -1; - const RECTANGLE_16* rects; - UINT32 nbRects; + const RECTANGLE_16* rects = NULL; + UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r3 = { 150, 151, 250, 251 }; RECTANGLE_16 r1_inter_r3[] = { @@ -574,8 +574,8 @@ static int test_r1_r3_inter_r11(void) REGION16 region; REGION16 intersection; int retCode = -1; - const RECTANGLE_16* rects; - UINT32 nbRects; + const RECTANGLE_16* rects = NULL; + UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r3 = { 150, 151, 250, 251 }; RECTANGLE_16 r11 = { 170, 151, 600, 301 }; @@ -634,9 +634,9 @@ static int test_norbert_case(void) REGION16 region; REGION16 intersection; int retCode = -1; - const RECTANGLE_16* rects; - UINT32 nbRects; - UINT32 i; + const RECTANGLE_16* rects = NULL; + UINT32 nbRects = 0; + UINT32 i = 0; RECTANGLE_16 inRectangles[5] = { { 1680, 0, 1920, 242 }, { 294, 242, 971, 776 }, { 1680, 242, 1920, 776 }, @@ -704,7 +704,7 @@ static int test_norbert2_case(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects; + const RECTANGLE_16* rects = NULL; UINT32 nbRects = 0; RECTANGLE_16 rect1 = { 464, 696, 476, 709 }; RECTANGLE_16 rect2 = { 0, 0, 1024, 32 }; @@ -777,7 +777,7 @@ static int test_empty_rectangle(void) REGION16 region; REGION16 intersection; int retCode = -1; - int i; + int i = 0; RECTANGLE_16 emptyRectangles[3] = { { 0, 0, 0, 0 }, { 10, 10, 10, 11 }, { 10, 10, 11, 10 } }; RECTANGLE_16 firstRect = { 0, 0, 100, 100 }; RECTANGLE_16 anotherRect = { 100, 100, 200, 200 }; @@ -845,7 +845,7 @@ static struct UnitaryTest tests[] = { { "Basic trivial tests", test_basic }, int TestFreeRDPRegion(int argc, char* argv[]) { - int i; + int i = 0; int testNb = 0; int retCode = -1; WINPR_UNUSED(argc); diff --git a/libfreerdp/codec/xcrush.c b/libfreerdp/codec/xcrush.c index 60bac3aed..2b41c7ea4 100644 --- a/libfreerdp/codec/xcrush.c +++ b/libfreerdp/codec/xcrush.c @@ -163,7 +163,7 @@ static const char* xcrush_get_level_1_compression_flags_string(UINT32 flags) static UINT32 xcrush_update_hash(const BYTE* data, UINT32 size) { - const BYTE* end; + const BYTE* end = NULL; UINT32 seed = 5381; /* same value as in djb2 */ WINPR_ASSERT(data); @@ -188,7 +188,7 @@ static UINT32 xcrush_update_hash(const BYTE* data, UINT32 size) static int xcrush_append_chunk(XCRUSH_CONTEXT* xcrush, const BYTE* data, UINT32* beg, UINT32 end) { - UINT32 size; + UINT32 size = 0; WINPR_ASSERT(xcrush); WINPR_ASSERT(data); @@ -301,7 +301,7 @@ static UINT32 xcrush_compute_signatures(XCRUSH_CONTEXT* xcrush, const BYTE* data static void xcrush_clear_hash_table_range(XCRUSH_CONTEXT* xcrush, UINT32 beg, UINT32 end) { - UINT32 index; + UINT32 index = 0; WINPR_ASSERT(xcrush); @@ -331,7 +331,7 @@ static void xcrush_clear_hash_table_range(XCRUSH_CONTEXT* xcrush, UINT32 beg, UI static int xcrush_find_next_matching_chunk(XCRUSH_CONTEXT* xcrush, XCRUSH_CHUNK* chunk, XCRUSH_CHUNK** pNextChunk) { - UINT32 index; + UINT32 index = 0; XCRUSH_CHUNK* next = NULL; WINPR_ASSERT(xcrush); @@ -363,8 +363,8 @@ static int xcrush_find_next_matching_chunk(XCRUSH_CONTEXT* xcrush, XCRUSH_CHUNK* static int xcrush_insert_chunk(XCRUSH_CONTEXT* xcrush, XCRUSH_SIGNATURE* signature, UINT32 offset, XCRUSH_CHUNK** pPrevChunk) { - UINT32 seed; - UINT32 index; + UINT32 seed = 0; + UINT32 index = 0; WINPR_ASSERT(xcrush); @@ -409,21 +409,21 @@ static int xcrush_find_match_length(XCRUSH_CONTEXT* xcrush, UINT32 MatchOffset, UINT32 HistoryOffset, UINT32 SrcSize, UINT32 MaxMatchLength, XCRUSH_MATCH_INFO* MatchInfo) { - UINT32 MatchSymbol; - UINT32 ChunkSymbol; - BYTE* ChunkBuffer; - BYTE* MatchBuffer; - BYTE* MatchStartPtr; - BYTE* ForwardChunkPtr; - BYTE* ReverseChunkPtr; - BYTE* ForwardMatchPtr; - BYTE* ReverseMatchPtr; - BYTE* HistoryBufferEnd; + UINT32 MatchSymbol = 0; + UINT32 ChunkSymbol = 0; + BYTE* ChunkBuffer = NULL; + BYTE* MatchBuffer = NULL; + BYTE* MatchStartPtr = NULL; + BYTE* ForwardChunkPtr = NULL; + BYTE* ReverseChunkPtr = NULL; + BYTE* ForwardMatchPtr = NULL; + BYTE* ReverseMatchPtr = NULL; + BYTE* HistoryBufferEnd = NULL; UINT32 ReverseMatchLength = 0; UINT32 ForwardMatchLength = 0; - UINT32 TotalMatchLength; - BYTE* HistoryBuffer; - UINT32 HistoryBufferSize; + UINT32 TotalMatchLength = 0; + BYTE* HistoryBuffer = NULL; + UINT32 HistoryBufferSize = 0; WINPR_ASSERT(xcrush); WINPR_ASSERT(MatchInfo); @@ -605,17 +605,17 @@ static int xcrush_find_all_matches(XCRUSH_CONTEXT* xcrush, UINT32 SignatureIndex static int xcrush_optimize_matches(XCRUSH_CONTEXT* xcrush) { - UINT32 i; + UINT32 i = 0; UINT32 j = 0; UINT32 MatchDiff = 0; UINT32 PrevMatchEnd = 0; UINT32 TotalMatchLength = 0; UINT32 OriginalMatchCount = 0; UINT32 OptimizedMatchCount = 0; - XCRUSH_MATCH_INFO* OriginalMatch; - XCRUSH_MATCH_INFO* OptimizedMatch; - XCRUSH_MATCH_INFO* OriginalMatches; - XCRUSH_MATCH_INFO* OptimizedMatches; + XCRUSH_MATCH_INFO* OriginalMatch = NULL; + XCRUSH_MATCH_INFO* OptimizedMatch = NULL; + XCRUSH_MATCH_INFO* OriginalMatches = NULL; + XCRUSH_MATCH_INFO* OptimizedMatches = NULL; WINPR_ASSERT(xcrush); @@ -673,16 +673,16 @@ static int xcrush_optimize_matches(XCRUSH_CONTEXT* xcrush) static int xcrush_generate_output(XCRUSH_CONTEXT* xcrush, BYTE* OutputBuffer, UINT32 OutputSize, UINT32 HistoryOffset, UINT32* pDstSize) { - BYTE* Literals; - BYTE* OutputEnd; - UINT32 MatchIndex; - UINT32 MatchOffset; - UINT16 MatchLength; - UINT32 MatchCount; - UINT32 CurrentOffset; - UINT32 MatchOffsetDiff; - UINT32 HistoryOffsetDiff; - RDP61_MATCH_DETAILS* MatchDetails; + BYTE* Literals = NULL; + BYTE* OutputEnd = NULL; + UINT32 MatchIndex = 0; + UINT32 MatchOffset = 0; + UINT16 MatchLength = 0; + UINT32 MatchCount = 0; + UINT32 CurrentOffset = 0; + UINT32 MatchOffsetDiff = 0; + UINT32 HistoryOffsetDiff = 0; + RDP61_MATCH_DETAILS* MatchDetails = NULL; WINPR_ASSERT(xcrush); WINPR_ASSERT(OutputBuffer); @@ -905,8 +905,8 @@ int xcrush_decompress(XCRUSH_CONTEXT* xcrush, const BYTE* pSrcData, UINT32 SrcSi int status = 0; UINT32 DstSize = 0; const BYTE* pDstData = NULL; - BYTE Level1ComprFlags; - BYTE Level2ComprFlags; + BYTE Level1ComprFlags = 0; + BYTE Level2ComprFlags = 0; WINPR_ASSERT(xcrush); diff --git a/libfreerdp/codec/yuv.c b/libfreerdp/codec/yuv.c index f609c8851..8823ebb3d 100644 --- a/libfreerdp/codec/yuv.c +++ b/libfreerdp/codec/yuv.c @@ -329,7 +329,7 @@ static BOOL submit_object(PTP_WORK* work_object, PTP_WORK_CALLBACK cb, const voi static void free_objects(PTP_WORK* work_objects, UINT32 waitCount) { - UINT32 i; + UINT32 i = 0; WINPR_ASSERT(work_objects || (waitCount == 0)); @@ -348,7 +348,7 @@ static void free_objects(PTP_WORK* work_objects, UINT32 waitCount) static BOOL intersects(UINT32 pos, const RECTANGLE_16* regionRects, UINT32 numRegionRects) { - UINT32 x; + UINT32 x = 0; WINPR_ASSERT(regionRects || (numRegionRects == 0)); @@ -386,7 +386,7 @@ static BOOL pool_decode(YUV_CONTEXT* context, PTP_WORK_CALLBACK cb, const BYTE* UINT32 nDstStep, const RECTANGLE_16* regionRects, UINT32 numRegionRects) { BOOL rc = FALSE; - UINT32 x; + UINT32 x = 0; UINT32 waitCount = 0; primitives_t* prims = primitives_get(); @@ -550,7 +550,7 @@ static BOOL pool_decode_rect(YUV_CONTEXT* context, BYTE type, const BYTE* pYUVDa UINT32 numRegionRects) { BOOL rc = FALSE; - UINT32 y; + UINT32 y = 0; UINT32 waitCount = 0; PTP_WORK_CALLBACK cb = yuv444_combine_work_callback; primitives_t* prims = primitives_get(); @@ -576,7 +576,7 @@ static BOOL pool_decode_rect(YUV_CONTEXT* context, BYTE type, const BYTE* pYUVDa /* case where we use threads */ for (waitCount = 0; waitCount < numRegionRects; waitCount++) { - YUV_COMBINE_WORK_PARAM* current; + YUV_COMBINE_WORK_PARAM* current = NULL; if (context->work_object_count <= waitCount) { @@ -646,7 +646,7 @@ static void CALLBACK yuv420_encode_work_callback(PTP_CALLBACK_INSTANCE instance, YUV_ENCODE_WORK_PARAM* param = (YUV_ENCODE_WORK_PARAM*)context; primitives_t* prims = primitives_get(); BYTE* pYUVData[3]; - const BYTE* src; + const BYTE* src = NULL; WINPR_UNUSED(instance); WINPR_UNUSED(work); @@ -677,7 +677,7 @@ static void CALLBACK yuv444v1_encode_work_callback(PTP_CALLBACK_INSTANCE instanc primitives_t* prims = primitives_get(); BYTE* pYUVLumaData[3]; BYTE* pYUVChromaData[3]; - const BYTE* src; + const BYTE* src = NULL; WINPR_UNUSED(instance); WINPR_UNUSED(work); @@ -714,7 +714,7 @@ static void CALLBACK yuv444v2_encode_work_callback(PTP_CALLBACK_INSTANCE instanc primitives_t* prims = primitives_get(); BYTE* pYUVLumaData[3]; BYTE* pYUVChromaData[3]; - const BYTE* src; + const BYTE* src = NULL; WINPR_UNUSED(instance); WINPR_UNUSED(work); @@ -786,8 +786,8 @@ static BOOL pool_encode(YUV_CONTEXT* context, PTP_WORK_CALLBACK cb, const BYTE* { BOOL rc = FALSE; primitives_t* prims = primitives_get(); - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; UINT32 waitCount = 0; WINPR_ASSERT(context); @@ -834,7 +834,7 @@ static BOOL pool_encode(YUV_CONTEXT* context, PTP_WORK_CALLBACK cb, const BYTE* for (y = 0; y < steps; y++) { RECTANGLE_16 r = *rect; - YUV_ENCODE_WORK_PARAM* current; + YUV_ENCODE_WORK_PARAM* current = NULL; if (context->work_object_count <= waitCount) { @@ -877,7 +877,7 @@ BOOL yuv444_context_encode(YUV_CONTEXT* context, BYTE version, const BYTE* pSrcD BYTE* pYUVLumaData[3], BYTE* pYUVChromaData[3], const RECTANGLE_16* regionRects, UINT32 numRegionRects) { - PTP_WORK_CALLBACK cb; + PTP_WORK_CALLBACK cb = NULL; switch (version) { case 1: diff --git a/libfreerdp/codec/zgfx.c b/libfreerdp/codec/zgfx.c index eb5dfd457..29cb720b4 100644 --- a/libfreerdp/codec/zgfx.c +++ b/libfreerdp/codec/zgfx.c @@ -138,7 +138,7 @@ static INLINE BOOL zgfx_GetBits(ZGFX_CONTEXT* zgfx, UINT32 nbits) static void zgfx_history_buffer_ring_write(ZGFX_CONTEXT* zgfx, const BYTE* src, size_t count) { - UINT32 front; + UINT32 front = 0; if (count <= 0) return; @@ -169,11 +169,11 @@ static void zgfx_history_buffer_ring_write(ZGFX_CONTEXT* zgfx, const BYTE* src, static void zgfx_history_buffer_ring_read(ZGFX_CONTEXT* zgfx, int offset, BYTE* dst, UINT32 count) { - UINT32 front; - UINT32 index; - INT32 bytes; - UINT32 valid; - INT32 bytesLeft; + UINT32 front = 0; + UINT32 index = 0; + INT32 bytes = 0; + UINT32 valid = 0; + INT32 bytesLeft = 0; BYTE* dptr = dst; BYTE* origDst = dst; @@ -216,16 +216,16 @@ static void zgfx_history_buffer_ring_read(ZGFX_CONTEXT* zgfx, int offset, BYTE* static BOOL zgfx_decompress_segment(ZGFX_CONTEXT* zgfx, wStream* stream, size_t segmentSize) { - BYTE c; - BYTE flags; + BYTE c = 0; + BYTE flags = 0; UINT32 extra = 0; - int opIndex; - UINT32 haveBits; - UINT32 inPrefix; - UINT32 count; - UINT32 distance; - BYTE* pbSegment; - size_t cbSegment; + int opIndex = 0; + UINT32 haveBits = 0; + UINT32 inPrefix = 0; + UINT32 count = 0; + UINT32 distance = 0; + BYTE* pbSegment = NULL; + size_t cbSegment = 0; if (!zgfx || !stream || (segmentSize < 2)) return FALSE; @@ -382,7 +382,7 @@ int zgfx_decompress(ZGFX_CONTEXT* zgfx, const BYTE* pSrcData, UINT32 SrcSize, BY UINT32* pDstSize, UINT32 flags) { int status = -1; - BYTE descriptor; + BYTE descriptor = 0; wStream sbuffer = { 0 }; wStream* stream = Stream_StaticConstInit(&sbuffer, pSrcData, SrcSize); @@ -412,11 +412,11 @@ int zgfx_decompress(ZGFX_CONTEXT* zgfx, const BYTE* pSrcData, UINT32 SrcSize, BY } else if (descriptor == ZGFX_SEGMENTED_MULTIPART) { - UINT32 segmentSize; - UINT16 segmentNumber; - UINT16 segmentCount; - UINT32 uncompressedSize; - BYTE* pConcatenated; + UINT32 segmentSize = 0; + UINT16 segmentNumber = 0; + UINT16 segmentCount = 0; + UINT32 uncompressedSize = 0; + BYTE* pConcatenated = NULL; size_t used = 0; if (!Stream_CheckAndLogRequiredLength(TAG, stream, 6)) @@ -486,11 +486,11 @@ static BOOL zgfx_compress_segment(ZGFX_CONTEXT* zgfx, wStream* s, const BYTE* pS int zgfx_compress_to_stream(ZGFX_CONTEXT* zgfx, wStream* sDst, const BYTE* pUncompressed, UINT32 uncompressedSize, UINT32* pFlags) { - int fragment; - UINT16 maxLength; - UINT32 totalLength; + int fragment = 0; + UINT16 maxLength = 0; + UINT32 totalLength = 0; size_t posSegmentCount = 0; - const BYTE* pSrcData; + const BYTE* pSrcData = NULL; int status = 0; maxLength = ZGFX_SEGMENTED_MAXSIZE; totalLength = uncompressedSize; @@ -498,10 +498,10 @@ int zgfx_compress_to_stream(ZGFX_CONTEXT* zgfx, wStream* sDst, const BYTE* pUnco for (fragment = 0; (totalLength > 0) || (fragment == 0); fragment++) { - UINT32 SrcSize; - size_t posDstSize; - size_t posDataStart; - UINT32 DstSize; + UINT32 SrcSize = 0; + size_t posDstSize = 0; + size_t posDataStart = 0; + UINT32 DstSize = 0; SrcSize = (totalLength > maxLength) ? maxLength : totalLength; posDstSize = 0; totalLength -= SrcSize; @@ -568,7 +568,7 @@ int zgfx_compress_to_stream(ZGFX_CONTEXT* zgfx, wStream* sDst, const BYTE* pUnco int zgfx_compress(ZGFX_CONTEXT* zgfx, const BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstData, UINT32* pDstSize, UINT32* pFlags) { - int status; + int status = 0; wStream* s = Stream_New(NULL, SrcSize); status = zgfx_compress_to_stream(zgfx, s, pSrcData, SrcSize, pFlags); (*ppDstData) = Stream_Buffer(s); @@ -584,7 +584,7 @@ void zgfx_context_reset(ZGFX_CONTEXT* zgfx, BOOL flush) ZGFX_CONTEXT* zgfx_context_new(BOOL Compressor) { - ZGFX_CONTEXT* zgfx; + ZGFX_CONTEXT* zgfx = NULL; zgfx = (ZGFX_CONTEXT*)calloc(1, sizeof(ZGFX_CONTEXT)); if (zgfx) diff --git a/libfreerdp/common/addin.c b/libfreerdp/common/addin.c index 899bbb35a..9c5cd1fad 100644 --- a/libfreerdp/common/addin.c +++ b/libfreerdp/common/addin.c @@ -47,12 +47,12 @@ static INLINE BOOL is_path_required(LPCSTR path, size_t len) LPSTR freerdp_get_library_install_path(void) { - LPSTR pszPath; - size_t cchPath; - size_t cchLibraryPath; - size_t cchInstallPrefix; - BOOL needLibPath; - BOOL needInstallPath; + LPSTR pszPath = NULL; + size_t cchPath = 0; + size_t cchLibraryPath = 0; + size_t cchInstallPrefix = 0; + BOOL needLibPath = 0; + BOOL needInstallPath = 0; LPCSTR pszLibraryPath = FREERDP_LIBRARY_PATH; LPCSTR pszInstallPrefix = FREERDP_INSTALL_PREFIX; cchLibraryPath = strlen(pszLibraryPath) + 1; @@ -92,12 +92,12 @@ LPSTR freerdp_get_dynamic_addin_install_path(void) #if defined(WITH_ADD_PLUGIN_TO_RPATH) return NULL; #else - LPSTR pszPath; - size_t cchPath; - size_t cchAddinPath; - size_t cchInstallPrefix; - BOOL needLibPath; - BOOL needInstallPath; + LPSTR pszPath = NULL; + size_t cchPath = 0; + size_t cchAddinPath = 0; + size_t cchInstallPrefix = 0; + BOOL needLibPath = 0; + BOOL needInstallPath = 0; LPCSTR pszAddinPath = FREERDP_ADDIN_PATH; LPCSTR pszInstallPrefix = FREERDP_INSTALL_PREFIX; cchAddinPath = strlen(pszAddinPath) + 1; @@ -145,16 +145,16 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_addin(LPCSTR pszFileName, LPCSTR pszPa LPSTR pszAddinInstallPath = freerdp_get_dynamic_addin_install_path(); PVIRTUALCHANNELENTRY entry = NULL; BOOL bHasExt = TRUE; - PCSTR pszExt; + PCSTR pszExt = NULL; size_t cchExt = 0; HINSTANCE library = NULL; - size_t cchFileName; - size_t cchFilePath; + size_t cchFileName = 0; + size_t cchFilePath = 0; LPSTR pszAddinFile = NULL; LPSTR pszFilePath = NULL; LPSTR pszRelativeFilePath = NULL; - size_t cchAddinFile; - size_t cchAddinInstallPath; + size_t cchAddinFile = 0; + size_t cchAddinInstallPath = 0; if (!pszFileName || !pszEntryName) goto fail; @@ -254,8 +254,8 @@ fail: PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LPCSTR pszSubsystem, LPCSTR pszType, DWORD dwFlags) { - PVIRTUALCHANNELENTRY entry; - LPSTR pszFileName; + PVIRTUALCHANNELENTRY entry = NULL; + LPSTR pszFileName = NULL; const size_t cchBaseFileName = sizeof(FREERDP_SHARED_LIBRARY_PREFIX) + 32; size_t nameLen = 0; size_t subsystemLen = 0; @@ -327,8 +327,8 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP if (pszSubsystem) { - LPSTR pszEntryName; - size_t cchEntryName; + LPSTR pszEntryName = NULL; + size_t cchEntryName = 0; /* subsystem add-in */ cchEntryName = 64 + nameLen; pszEntryName = (LPSTR)malloc(cchEntryName + 1); diff --git a/libfreerdp/common/assistance.c b/libfreerdp/common/assistance.c index 75d9bd1f1..8aa112af1 100644 --- a/libfreerdp/common/assistance.c +++ b/libfreerdp/common/assistance.c @@ -760,9 +760,9 @@ out_fail: char* freerdp_assistance_construct_expert_blob(const char* name, const char* pass) { - size_t size; - size_t nameLength; - size_t passLength; + size_t size = 0; + size_t nameLength = 0; + size_t passLength = 0; char* ExpertBlob = NULL; if (!name || !pass) @@ -828,17 +828,17 @@ char* freerdp_assistance_generate_pass_stub(DWORD flags) BYTE* freerdp_assistance_encrypt_pass_stub(const char* password, const char* passStub, size_t* pEncryptedSize) { - BOOL rc; - size_t cbPasswordW; - size_t cbPassStubW; - size_t EncryptedSize; + BOOL rc = 0; + size_t cbPasswordW = 0; + size_t cbPassStubW = 0; + size_t EncryptedSize = 0; BYTE PasswordHash[WINPR_MD5_DIGEST_LENGTH]; WINPR_CIPHER_CTX* rc4Ctx = NULL; BYTE* pbIn = NULL; BYTE* pbOut = NULL; - size_t cbOut; - size_t cbIn; - size_t cbFinal; + size_t cbOut = 0; + size_t cbIn = 0; + size_t cbFinal = 0; WCHAR* PasswordW = ConvertUtf8ToWCharAlloc(password, &cbPasswordW); WCHAR* PassStubW = ConvertUtf8ToWCharAlloc(passStub, &cbPassStubW); @@ -903,15 +903,15 @@ static BOOL freerdp_assistance_decrypt2(rdpAssistanceFile* file) { BOOL rc = FALSE; int status = 0; - size_t cbPasswordW; + size_t cbPasswordW = 0; size_t cchOutW = 0; WINPR_CIPHER_CTX* aesDec = NULL; WCHAR* PasswordW = NULL; BYTE* pbIn = NULL; BYTE* pbOut = NULL; - size_t cbOut; - size_t cbIn; - size_t cbFinal; + size_t cbOut = 0; + size_t cbIn = 0; + size_t cbFinal = 0; BYTE DerivedKey[WINPR_AES_BLOCK_SIZE] = { 0 }; BYTE InitializationVector[WINPR_AES_BLOCK_SIZE] = { 0 }; BYTE PasswordHash[WINPR_SHA1_DIGEST_LENGTH] = { 0 }; @@ -1200,10 +1200,10 @@ int freerdp_assistance_parse_file_buffer(rdpAssistanceFile* file, const char* cb int freerdp_assistance_parse_file(rdpAssistanceFile* file, const char* name, const char* password) { - int status; - BYTE* buffer; + int status = 0; + BYTE* buffer = NULL; FILE* fp = NULL; - size_t readSize; + size_t readSize = 0; union { INT64 i64; diff --git a/libfreerdp/common/settings.c b/libfreerdp/common/settings.c index 72b7abbe2..9478bd975 100644 --- a/libfreerdp/common/settings.c +++ b/libfreerdp/common/settings.c @@ -42,8 +42,8 @@ BOOL freerdp_addin_argv_add_argument_ex(ADDIN_ARGV* args, const char* argument, size_t len) { - char* str; - char** new_argv; + char* str = NULL; + char** new_argv = NULL; if (!args || !argument) return FALSE; @@ -73,7 +73,7 @@ BOOL freerdp_addin_argv_add_argument(ADDIN_ARGV* args, const char* argument) BOOL freerdp_addin_argv_del_argument(ADDIN_ARGV* args, const char* argument) { - int x; + int x = 0; if (!args || !argument) return FALSE; for (x = 0; x < args->argc; x++) @@ -94,7 +94,7 @@ BOOL freerdp_addin_argv_del_argument(ADDIN_ARGV* args, const char* argument) int freerdp_addin_set_argument(ADDIN_ARGV* args, const char* argument) { - int i; + int i = 0; if (!args || !argument) return -2; @@ -113,7 +113,7 @@ int freerdp_addin_set_argument(ADDIN_ARGV* args, const char* argument) int freerdp_addin_replace_argument(ADDIN_ARGV* args, const char* previous, const char* argument) { - int i; + int i = 0; if (!args || !previous || !argument) return -2; @@ -138,11 +138,11 @@ int freerdp_addin_replace_argument(ADDIN_ARGV* args, const char* previous, const int freerdp_addin_set_argument_value(ADDIN_ARGV* args, const char* option, const char* value) { - BOOL rc; - int i; - char* p; - char* str; - size_t length; + BOOL rc = 0; + int i = 0; + char* p = NULL; + char* str = NULL; + size_t length = 0; if (!args || !option || !value) return -2; length = strlen(option) + strlen(value) + 1; @@ -178,10 +178,10 @@ int freerdp_addin_set_argument_value(ADDIN_ARGV* args, const char* option, const int freerdp_addin_replace_argument_value(ADDIN_ARGV* args, const char* previous, const char* option, const char* value) { - int i; - BOOL rc; - char* str; - size_t length; + int i = 0; + BOOL rc = 0; + char* str = NULL; + size_t length = 0; if (!args || !previous || !option || !value) return -2; length = strlen(option) + strlen(value) + 1; @@ -211,8 +211,8 @@ int freerdp_addin_replace_argument_value(ADDIN_ARGV* args, const char* previous, BOOL freerdp_device_collection_add(rdpSettings* settings, RDPDR_DEVICE* device) { - UINT32 count; - UINT32 old; + UINT32 count = 0; + UINT32 old = 0; WINPR_ASSERT(settings); WINPR_ASSERT(device); @@ -221,7 +221,7 @@ BOOL freerdp_device_collection_add(rdpSettings* settings, RDPDR_DEVICE* device) if (old < count) { UINT32 new_size = old * 2; - RDPDR_DEVICE** new_array; + RDPDR_DEVICE** new_array = NULL; if (new_size == 0) new_size = count * 2; @@ -245,8 +245,8 @@ BOOL freerdp_device_collection_add(rdpSettings* settings, RDPDR_DEVICE* device) RDPDR_DEVICE* freerdp_device_collection_find(rdpSettings* settings, const char* name) { - UINT32 index; - RDPDR_DEVICE* device; + UINT32 index = 0; + RDPDR_DEVICE* device = NULL; WINPR_ASSERT(settings); WINPR_ASSERT(name); @@ -266,8 +266,8 @@ RDPDR_DEVICE* freerdp_device_collection_find(rdpSettings* settings, const char* RDPDR_DEVICE* freerdp_device_collection_find_type(rdpSettings* settings, UINT32 type) { - UINT32 index; - RDPDR_DEVICE* device; + UINT32 index = 0; + RDPDR_DEVICE* device = NULL; WINPR_ASSERT(settings); for (index = 0; index < settings->DeviceCount; index++) @@ -283,7 +283,7 @@ RDPDR_DEVICE* freerdp_device_collection_find_type(rdpSettings* settings, UINT32 RDPDR_DEVICE* freerdp_device_new(UINT32 Type, size_t count, const char* args[]) { - size_t size; + size_t size = 0; union { RDPDR_DEVICE* base; @@ -539,7 +539,7 @@ RDPDR_DEVICE* freerdp_device_clone(const RDPDR_DEVICE* device) void freerdp_device_collection_free(rdpSettings* settings) { - UINT32 index; + UINT32 index = 0; WINPR_ASSERT(settings); @@ -558,7 +558,7 @@ void freerdp_device_collection_free(rdpSettings* settings) BOOL freerdp_static_channel_collection_del(rdpSettings* settings, const char* name) { - UINT32 x; + UINT32 x = 0; const UINT32 count = freerdp_settings_get_uint32(settings, FreeRDP_StaticChannelCount); if (!settings || !settings->StaticChannelArray) return FALSE; @@ -590,7 +590,7 @@ BOOL freerdp_static_channel_collection_del(rdpSettings* settings, const char* na BOOL freerdp_static_channel_collection_add(rdpSettings* settings, ADDIN_ARGV* channel) { - UINT32 count; + UINT32 count = 0; WINPR_ASSERT(settings); WINPR_ASSERT(channel); @@ -630,8 +630,8 @@ BOOL freerdp_static_channel_collection_add(rdpSettings* settings, ADDIN_ARGV* ch ADDIN_ARGV* freerdp_static_channel_collection_find(rdpSettings* settings, const char* name) { - UINT32 index; - ADDIN_ARGV* channel; + UINT32 index = 0; + ADDIN_ARGV* channel = NULL; WINPR_ASSERT(settings); WINPR_ASSERT(name); @@ -650,7 +650,7 @@ ADDIN_ARGV* freerdp_static_channel_collection_find(rdpSettings* settings, const void freerdp_static_channel_collection_free(rdpSettings* settings) { - UINT32 i; + UINT32 i = 0; if (!settings) return; @@ -669,7 +669,7 @@ void freerdp_static_channel_collection_free(rdpSettings* settings) BOOL freerdp_dynamic_channel_collection_del(rdpSettings* settings, const char* name) { - UINT32 x; + UINT32 x = 0; const UINT32 count = freerdp_settings_get_uint32(settings, FreeRDP_DynamicChannelCount); if (!settings || !settings->DynamicChannelArray) return FALSE; @@ -699,8 +699,8 @@ BOOL freerdp_dynamic_channel_collection_del(rdpSettings* settings, const char* n BOOL freerdp_dynamic_channel_collection_add(rdpSettings* settings, ADDIN_ARGV* channel) { - UINT32 count; - UINT32 oldSize; + UINT32 count = 0; + UINT32 oldSize = 0; WINPR_ASSERT(settings); WINPR_ASSERT(channel); @@ -709,7 +709,7 @@ BOOL freerdp_dynamic_channel_collection_add(rdpSettings* settings, ADDIN_ARGV* c oldSize = freerdp_settings_get_uint32(settings, FreeRDP_DynamicChannelArraySize); if (oldSize < count) { - ADDIN_ARGV** new_array; + ADDIN_ARGV** new_array = NULL; UINT32 size = oldSize * 2; if (size == 0) size = count * 2; @@ -735,8 +735,8 @@ BOOL freerdp_dynamic_channel_collection_add(rdpSettings* settings, ADDIN_ARGV* c ADDIN_ARGV* freerdp_dynamic_channel_collection_find(const rdpSettings* settings, const char* name) { - UINT32 index; - ADDIN_ARGV* channel; + UINT32 index = 0; + ADDIN_ARGV* channel = NULL; WINPR_ASSERT(settings); WINPR_ASSERT(name); @@ -755,7 +755,7 @@ ADDIN_ARGV* freerdp_dynamic_channel_collection_find(const rdpSettings* settings, void freerdp_addin_argv_free(ADDIN_ARGV* args) { - int index; + int index = 0; if (!args) return; @@ -784,7 +784,7 @@ ADDIN_ARGV* freerdp_addin_argv_new(size_t argc, const char* argv[]) if (argv) { - size_t x; + size_t x = 0; for (x = 0; x < argc; x++) { args->argv[x] = _strdup(argv[x]); @@ -814,7 +814,7 @@ ADDIN_ARGV* freerdp_addin_argv_clone(const ADDIN_ARGV* args) void freerdp_dynamic_channel_collection_free(rdpSettings* settings) { - UINT32 i; + UINT32 i = 0; WINPR_ASSERT(settings); @@ -832,7 +832,7 @@ void freerdp_dynamic_channel_collection_free(rdpSettings* settings) void freerdp_capability_buffer_free(rdpSettings* settings) { - UINT32 x; + UINT32 x = 0; WINPR_ASSERT(settings); @@ -909,7 +909,7 @@ void freerdp_target_net_addresses_free(rdpSettings* settings) void freerdp_server_license_issuers_free(rdpSettings* settings) { - UINT32 x; + UINT32 x = 0; WINPR_ASSERT(settings); if (settings->ServerLicenseProductIssuers) @@ -924,7 +924,7 @@ void freerdp_server_license_issuers_free(rdpSettings* settings) BOOL freerdp_server_license_issuers_copy(rdpSettings* settings, char** issuers, UINT32 count) { - UINT32 x; + UINT32 x = 0; WINPR_ASSERT(settings); WINPR_ASSERT(issuers || (count == 0)); @@ -1116,7 +1116,7 @@ int freerdp_set_param_string(rdpSettings* settings, int id, const char* param) static BOOL value_to_uint(const char* value, ULONGLONG* result, ULONGLONG min, ULONGLONG max) { char* endptr = NULL; - unsigned long long rc; + unsigned long long rc = 0; if (!value || !result) return FALSE; @@ -1140,7 +1140,7 @@ static BOOL value_to_uint(const char* value, ULONGLONG* result, ULONGLONG min, U static BOOL value_to_int(const char* value, LONGLONG* result, LONGLONG min, LONGLONG max) { char* endptr = NULL; - long long rc; + long long rc = 0; if (!value || !result) return FALSE; @@ -1169,9 +1169,9 @@ static BOOL parsing_fail(const char* key, const char* type, const char* value) BOOL freerdp_settings_set_value_for_name(rdpSettings* settings, const char* name, const char* value) { - ULONGLONG uval; - LONGLONG ival; - SSIZE_T type; + ULONGLONG uval = 0; + LONGLONG ival = 0; + SSIZE_T type = 0; if (!settings || !name) return FALSE; @@ -1489,7 +1489,7 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke void* freerdp_settings_get_pointer_array_writable(const rdpSettings* settings, FreeRDP_Settings_Keys_Pointer id, size_t offset) { - size_t max; + size_t max = 0; if (!settings) return NULL; switch (id) @@ -1979,7 +1979,7 @@ BOOL freerdp_settings_update_from_caps(rdpSettings* settings, const BYTE* capsFl const BYTE** capsData, const UINT32* capsSizes, UINT32 capsCount, BOOL serverReceivedCaps) { - UINT32 x; + UINT32 x = 0; WINPR_ASSERT(settings); WINPR_ASSERT(capsFlags || (capsCount == 0)); WINPR_ASSERT(capsData || (capsCount == 0)); diff --git a/libfreerdp/common/test/TestAddinArgv.c b/libfreerdp/common/test/TestAddinArgv.c index 94bb9b04a..2e057fbe8 100644 --- a/libfreerdp/common/test/TestAddinArgv.c +++ b/libfreerdp/common/test/TestAddinArgv.c @@ -6,8 +6,8 @@ static BOOL test_alloc(void) { BOOL rc = FALSE; - int rng; - int x; + int rng = 0; + int x = 0; const char* param[] = { "foo:", "bar", "bla", "rdp", NULL }; ADDIN_ARGV* arg1 = NULL; ADDIN_ARGV* arg2 = NULL; @@ -59,7 +59,7 @@ fail: static BOOL test_clone(void) { - int x; + int x = 0; BOOL rc = FALSE; const char* param[] = { "foo:", "bar", "bla", "rdp" }; ADDIN_ARGV* arg = NULL; @@ -95,8 +95,8 @@ fail: static BOOL test_add_remove(void) { - size_t x; - size_t y; + size_t x = 0; + size_t y = 0; const char* args[] = { "foo", "bar", "bla", "gaga" }; BOOL rc = FALSE; ADDIN_ARGV* arg = NULL; @@ -150,7 +150,7 @@ fail: static BOOL test_set_argument(void) { - int ret; + int ret = 0; const char* newarg = "foobar"; const char* args[] = { "foo", "bar", "bla", "gaga" }; BOOL rc = FALSE; @@ -188,7 +188,7 @@ fail: static BOOL test_replace_argument(void) { - int ret; + int ret = 0; const char* newarg = "foobar"; const char* args[] = { "foo", "bar", "bla", "gaga" }; BOOL rc = FALSE; @@ -229,7 +229,7 @@ fail: static BOOL test_set_argument_value(void) { - int ret; + int ret = 0; const char* newarg1 = "foobar"; const char* newarg2 = "lalala"; const char* fullnewarg1 = "foo:foobar"; @@ -277,7 +277,7 @@ fail: static BOOL test_replace_argument_value(void) { - int ret; + int ret = 0; const char* newarg1 = "foobar"; const char* newarg2 = "lalala"; const char* fullnewarg1 = "foo:foobar"; diff --git a/libfreerdp/common/test/TestCommonAssistance.c b/libfreerdp/common/test/TestCommonAssistance.c index 5a0e309b8..35fe86311 100644 --- a/libfreerdp/common/test/TestCommonAssistance.c +++ b/libfreerdp/common/test/TestCommonAssistance.c @@ -196,7 +196,7 @@ static BOOL test_file_to_settings(wLog* log, rdpAssistanceFile* file) static BOOL test_file_from_buffer(wLog* log, const char* data, size_t size, const char* pwd) { BOOL rc = FALSE; - int status; + int status = 0; char* pass = NULL; char* expertBlob = NULL; const char* EncryptedPassStub = NULL; @@ -262,7 +262,7 @@ static BOOL test_msrsc_incident_file_type2(wLog* log) int TestCommonAssistance(int argc, char* argv[]) { - wLog* log; + wLog* log = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); log = WLog_Get(__func__); diff --git a/libfreerdp/core/activation.c b/libfreerdp/core/activation.c index 866a4165b..64eff3ce8 100644 --- a/libfreerdp/core/activation.c +++ b/libfreerdp/core/activation.c @@ -45,8 +45,8 @@ static BOOL rdp_write_synchronize_pdu(wStream* s, const rdpSettings* settings) static BOOL rdp_recv_sync_pdu(rdpRdp* rdp, wStream* s, const char* what) { - UINT16 msgType; - UINT16 targetUser; + UINT16 msgType = 0; + UINT16 targetUser = 0; WINPR_UNUSED(rdp); if (!Stream_CheckAndLogRequiredLengthEx(TAG, WLOG_WARN, s, 4, 1, "%s(%s:%" PRIuz ") %s", @@ -142,9 +142,9 @@ static BOOL rdp_write_client_control_pdu(wStream* s, UINT16 action, UINT16 grant BOOL rdp_recv_server_control_pdu(rdpRdp* rdp, wStream* s) { - UINT16 action; - UINT16 grantId; - UINT32 controlId; + UINT16 action = 0; + UINT16 grantId = 0; + UINT32 controlId = 0; WINPR_ASSERT(rdp); WINPR_ASSERT(s); @@ -276,12 +276,12 @@ static BOOL rdp_write_client_persistent_key_list_pdu(wStream* s, RDP_BITMAP_PERS static UINT32 rdp_load_persistent_key_list(rdpRdp* rdp, UINT64** pKeyList) { - int index; - int count; - int status; - UINT32 keyCount; + int index = 0; + int count = 0; + int status = 0; + UINT32 keyCount = 0; UINT64* keyList = NULL; - rdpPersistentCache* persistent; + rdpPersistentCache* persistent = NULL; rdpSettings* settings = rdp->settings; *pKeyList = NULL; @@ -332,7 +332,7 @@ error: BOOL rdp_send_client_persistent_key_list_pdu(rdpRdp* rdp) { - UINT32 keyCount; + UINT32 keyCount = 0; UINT32 keyMaxFrag = 2042; UINT64* keyList = NULL; RDP_BITMAP_PERSISTENT_INFO info; @@ -424,11 +424,11 @@ BOOL rdp_recv_client_font_list_pdu(wStream* s) BOOL rdp_recv_client_persistent_key_list_pdu(wStream* s) { - BYTE flags; + BYTE flags = 0; size_t count = 0; size_t total = 0; - UINT16 cache; - UINT16 x; + UINT16 cache = 0; + UINT16 x = 0; WINPR_ASSERT(s); @@ -518,10 +518,10 @@ BOOL rdp_send_client_font_list_pdu(rdpRdp* rdp, UINT16 flags) BOOL rdp_recv_font_map_pdu(rdpRdp* rdp, wStream* s) { - UINT16 numberEntries; - UINT16 totalNumEntries; - UINT16 mapFlags; - UINT16 entrySize; + UINT16 numberEntries = 0; + UINT16 totalNumEntries = 0; + UINT16 mapFlags = 0; + UINT16 entrySize = 0; WINPR_ASSERT(rdp); WINPR_ASSERT(rdp->settings); @@ -589,7 +589,7 @@ BOOL rdp_send_server_font_map_pdu(rdpRdp* rdp) BOOL rdp_recv_deactivate_all(rdpRdp* rdp, wStream* s) { - UINT16 lengthSourceDescriptor; + UINT16 lengthSourceDescriptor = 0; WINPR_ASSERT(rdp); WINPR_ASSERT(s); @@ -614,7 +614,7 @@ BOOL rdp_recv_deactivate_all(rdpRdp* rdp, wStream* s) { do { - UINT32 ShareId; + UINT32 ShareId = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) break; @@ -740,8 +740,8 @@ BOOL rdp_server_accept_client_control_pdu(rdpRdp* rdp, wStream* s) BOOL rdp_server_accept_client_font_list_pdu(rdpRdp* rdp, wStream* s) { - rdpSettings* settings; - freerdp_peer* peer; + rdpSettings* settings = NULL; + freerdp_peer* peer = NULL; WINPR_ASSERT(rdp); WINPR_ASSERT(s); @@ -784,7 +784,7 @@ BOOL rdp_server_accept_client_persistent_key_list_pdu(rdpRdp* rdp, wStream* s) const char* rdp_ctrlaction_string(UINT16 action, char* buffer, size_t size) { - const char* actstr; + const char* actstr = NULL; switch (action) { case CTRLACTION_COOPERATE: diff --git a/libfreerdp/core/autodetect.c b/libfreerdp/core/autodetect.c index 5643431ad..bb73a7050 100644 --- a/libfreerdp/core/autodetect.c +++ b/libfreerdp/core/autodetect.c @@ -132,8 +132,8 @@ static const char* autodetect_request_type_to_string_buffer(UINT32 requestType, static BOOL autodetect_send_rtt_measure_request(rdpAutoDetect* autodetect, RDP_TRANSPORT_TYPE transport, UINT16 sequenceNumber) { - UINT16 requestType; - wStream* s; + UINT16 requestType = 0; + wStream* s = NULL; WINPR_ASSERT(autodetect); WINPR_ASSERT(autodetect->context); @@ -158,7 +158,7 @@ static BOOL autodetect_send_rtt_measure_request(rdpAutoDetect* autodetect, static BOOL autodetect_send_rtt_measure_response(rdpAutoDetect* autodetect, UINT16 sequenceNumber) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(autodetect); WINPR_ASSERT(autodetect->context); @@ -182,8 +182,8 @@ static BOOL autodetect_send_bandwidth_measure_start(rdpAutoDetect* autodetect, RDP_TRANSPORT_TYPE transport, UINT16 sequenceNumber) { - UINT16 requestType; - wStream* s; + UINT16 requestType = 0; + wStream* s = NULL; WINPR_ASSERT(autodetect); WINPR_ASSERT(autodetect->context); @@ -210,7 +210,7 @@ static BOOL autodetect_send_bandwidth_measure_payload(rdpAutoDetect* autodetect, RDP_TRANSPORT_TYPE transport, UINT16 sequenceNumber, UINT16 payloadLength) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(autodetect); WINPR_ASSERT(autodetect->context); @@ -249,8 +249,8 @@ static BOOL autodetect_send_bandwidth_measure_stop(rdpAutoDetect* autodetect, RDP_TRANSPORT_TYPE transport, UINT16 sequenceNumber, UINT16 payloadLength) { - UINT16 requestType; - wStream* s; + UINT16 requestType = 0; + wStream* s = NULL; WINPR_ASSERT(autodetect); WINPR_ASSERT(autodetect->context); @@ -306,7 +306,7 @@ static BOOL autodetect_send_bandwidth_measure_results(rdpAutoDetect* autodetect, UINT16 responseType, UINT16 sequenceNumber) { BOOL success = TRUE; - wStream* s; + wStream* s = NULL; UINT64 timeDelta = GetTickCount64(); WINPR_ASSERT(autodetect); @@ -358,7 +358,7 @@ static BOOL autodetect_send_netchar_result(rdpAutoDetect* autodetect, RDP_TRANSP UINT16 sequenceNumber, const rdpNetworkCharacteristicsResult* result) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(autodetect); WINPR_ASSERT(autodetect->context); @@ -432,7 +432,7 @@ autodetect_on_connect_time_auto_detect_progress_default(rdpAutoDetect* autodetec static BOOL autodetect_send_netchar_sync(rdpAutoDetect* autodetect, RDP_TRANSPORT_TYPE transport, UINT16 sequenceNumber) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(autodetect); WINPR_ASSERT(autodetect->context); @@ -544,7 +544,7 @@ static BOOL autodetect_recv_bandwidth_measure_payload(rdpAutoDetect* autodetect, RDP_TRANSPORT_TYPE transport, wStream* s, const AUTODETECT_REQ_PDU* autodetectReqPdu) { - UINT16 payloadLength; + UINT16 payloadLength = 0; WINPR_ASSERT(autodetect); WINPR_ASSERT(s); @@ -578,8 +578,8 @@ static BOOL autodetect_recv_bandwidth_measure_stop(rdpAutoDetect* autodetect, RDP_TRANSPORT_TYPE transport, wStream* s, const AUTODETECT_REQ_PDU* autodetectReqPdu) { - UINT16 payloadLength; - UINT16 responseType; + UINT16 payloadLength = 0; + UINT16 responseType = 0; WINPR_ASSERT(autodetect); WINPR_ASSERT(s); @@ -640,8 +640,8 @@ static BOOL autodetect_recv_bandwidth_measure_results(rdpAutoDetect* autodetect, RDP_TRANSPORT_TYPE transport, wStream* s, const AUTODETECT_RSP_PDU* autodetectRspPdu) { - UINT32 timeDelta; - UINT32 byteCount; + UINT32 timeDelta = 0; + UINT32 byteCount = 0; BOOL success = TRUE; WINPR_ASSERT(autodetect); @@ -795,7 +795,7 @@ state_run_t autodetect_recv_request_packet(rdpAutoDetect* autodetect, RDP_TRANSP wStream* s) { AUTODETECT_REQ_PDU autodetectReqPdu = { 0 }; - const rdpSettings* settings; + const rdpSettings* settings = NULL; BOOL success = FALSE; WINPR_ASSERT(autodetect); @@ -901,7 +901,7 @@ state_run_t autodetect_recv_response_packet(rdpAutoDetect* autodetect, RDP_TRANS wStream* s) { AUTODETECT_RSP_PDU autodetectRspPdu = { 0 }; - const rdpSettings* settings; + const rdpSettings* settings = NULL; BOOL success = FALSE; WINPR_ASSERT(autodetect); diff --git a/libfreerdp/core/capabilities.c b/libfreerdp/core/capabilities.c index 5caca0ce0..a56e16f59 100644 --- a/libfreerdp/core/capabilities.c +++ b/libfreerdp/core/capabilities.c @@ -198,9 +198,9 @@ static BOOL rdp_apply_general_capability_set(rdpSettings* settings, const rdpSet static BOOL rdp_read_general_capability_set(wStream* s, rdpSettings* settings) { - UINT16 extraFlags; - BYTE refreshRectSupport; - BYTE suppressOutputSupport; + UINT16 extraFlags = 0; + BYTE refreshRectSupport = 0; + BYTE suppressOutputSupport = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 20)) return FALSE; @@ -288,17 +288,17 @@ static BOOL rdp_write_general_capability_set(wStream* s, const rdpSettings* sett #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_general_capability_set(wStream* s) { - UINT16 osMajorType; - UINT16 osMinorType; - UINT16 protocolVersion; - UINT16 pad2OctetsA; - UINT16 generalCompressionTypes; - UINT16 extraFlags; - UINT16 updateCapabilityFlag; - UINT16 remoteUnshareFlag; - UINT16 generalCompressionLevel; - BYTE refreshRectSupport; - BYTE suppressOutputSupport; + UINT16 osMajorType = 0; + UINT16 osMinorType = 0; + UINT16 protocolVersion = 0; + UINT16 pad2OctetsA = 0; + UINT16 generalCompressionTypes = 0; + UINT16 extraFlags = 0; + UINT16 updateCapabilityFlag = 0; + UINT16 remoteUnshareFlag = 0; + UINT16 generalCompressionLevel = 0; + BYTE refreshRectSupport = 0; + BYTE suppressOutputSupport = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 20)) return FALSE; @@ -368,11 +368,11 @@ static BOOL rdp_apply_bitmap_capability_set(rdpSettings* settings, const rdpSett static BOOL rdp_read_bitmap_capability_set(wStream* s, rdpSettings* settings) { - BYTE drawingFlags; - UINT16 desktopWidth; - UINT16 desktopHeight; - UINT16 desktopResizeFlag; - UINT16 preferredBitsPerPixel; + BYTE drawingFlags = 0; + UINT16 desktopWidth = 0; + UINT16 desktopHeight = 0; + UINT16 desktopResizeFlag = 0; + UINT16 preferredBitsPerPixel = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 24)) return FALSE; @@ -467,19 +467,19 @@ static BOOL rdp_write_bitmap_capability_set(wStream* s, const rdpSettings* setti #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_bitmap_capability_set(wStream* s) { - UINT16 preferredBitsPerPixel; - UINT16 receive1BitPerPixel; - UINT16 receive4BitsPerPixel; - UINT16 receive8BitsPerPixel; - UINT16 desktopWidth; - UINT16 desktopHeight; - UINT16 pad2Octets; - UINT16 desktopResizeFlag; - UINT16 bitmapCompressionFlag; - BYTE highColorFlags; - BYTE drawingFlags; - UINT16 multipleRectangleSupport; - UINT16 pad2OctetsB; + UINT16 preferredBitsPerPixel = 0; + UINT16 receive1BitPerPixel = 0; + UINT16 receive4BitsPerPixel = 0; + UINT16 receive8BitsPerPixel = 0; + UINT16 desktopWidth = 0; + UINT16 desktopHeight = 0; + UINT16 pad2Octets = 0; + UINT16 desktopResizeFlag = 0; + UINT16 bitmapCompressionFlag = 0; + BYTE highColorFlags = 0; + BYTE drawingFlags = 0; + UINT16 multipleRectangleSupport = 0; + UINT16 pad2OctetsB = 0; WLog_VRB(TAG, "BitmapCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); if (!Stream_CheckAndLogRequiredLength(TAG, s, 24)) @@ -519,7 +519,7 @@ static BOOL rdp_apply_order_capability_set(rdpSettings* settings, const rdpSetti WINPR_ASSERT(settings); WINPR_ASSERT(src); - int i; + int i = 0; BOOL BitmapCacheV3Enabled = FALSE; BOOL FrameMarkerCommandEnabled = FALSE; @@ -559,7 +559,7 @@ static BOOL rdp_apply_order_capability_set(rdpSettings* settings, const rdpSetti static BOOL rdp_read_order_capability_set(wStream* s, rdpSettings* settings) { - size_t i; + size_t i = 0; char terminalDescriptor[17] = { 0 }; BYTE orderSupport[32] = { 0 }; BOOL BitmapCacheV3Enabled = FALSE; @@ -671,22 +671,22 @@ static BOOL rdp_write_order_capability_set(wStream* s, const rdpSettings* settin static BOOL rdp_print_order_capability_set(wStream* s) { BYTE terminalDescriptor[16]; - UINT32 pad4OctetsA; - UINT16 desktopSaveXGranularity; - UINT16 desktopSaveYGranularity; - UINT16 pad2OctetsA; - UINT16 maximumOrderLevel; - UINT16 numberFonts; - UINT16 orderFlags; + UINT32 pad4OctetsA = 0; + UINT16 desktopSaveXGranularity = 0; + UINT16 desktopSaveYGranularity = 0; + UINT16 pad2OctetsA = 0; + UINT16 maximumOrderLevel = 0; + UINT16 numberFonts = 0; + UINT16 orderFlags = 0; BYTE orderSupport[32]; - UINT16 textFlags; - UINT16 orderSupportExFlags; - UINT32 pad4OctetsB; - UINT32 desktopSaveSize; - UINT16 pad2OctetsC; - UINT16 pad2OctetsD; - UINT16 textANSICodePage; - UINT16 pad2OctetsE; + UINT16 textFlags = 0; + UINT16 orderSupportExFlags = 0; + UINT32 pad4OctetsB = 0; + UINT32 desktopSaveSize = 0; + UINT16 pad2OctetsC = 0; + UINT16 pad2OctetsD = 0; + UINT16 textANSICodePage = 0; + UINT16 pad2OctetsE = 0; WLog_VRB(TAG, "OrderCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); if (!Stream_CheckAndLogRequiredLength(TAG, s, 84)) @@ -838,18 +838,18 @@ static BOOL rdp_write_bitmap_cache_capability_set(wStream* s, const rdpSettings* #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_bitmap_cache_capability_set(wStream* s) { - UINT32 pad1; - UINT32 pad2; - UINT32 pad3; - UINT32 pad4; - UINT32 pad5; - UINT32 pad6; - UINT16 Cache0Entries; - UINT16 Cache0MaximumCellSize; - UINT16 Cache1Entries; - UINT16 Cache1MaximumCellSize; - UINT16 Cache2Entries; - UINT16 Cache2MaximumCellSize; + UINT32 pad1 = 0; + UINT32 pad2 = 0; + UINT32 pad3 = 0; + UINT32 pad4 = 0; + UINT32 pad5 = 0; + UINT32 pad6 = 0; + UINT16 Cache0Entries = 0; + UINT16 Cache0MaximumCellSize = 0; + UINT16 Cache1Entries = 0; + UINT16 Cache1MaximumCellSize = 0; + UINT16 Cache2Entries = 0; + UINT16 Cache2MaximumCellSize = 0; WLog_VRB(TAG, "BitmapCacheCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); if (!Stream_CheckAndLogRequiredLength(TAG, s, 36)) @@ -931,10 +931,10 @@ static BOOL rdp_write_control_capability_set(wStream* s, const rdpSettings* sett #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_control_capability_set(wStream* s) { - UINT16 controlFlags; - UINT16 remoteDetachFlag; - UINT16 controlInterest; - UINT16 detachInterest; + UINT16 controlFlags = 0; + UINT16 remoteDetachFlag = 0; + UINT16 controlInterest = 0; + UINT16 detachInterest = 0; WLog_VRB(TAG, "ControlCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) @@ -1003,10 +1003,10 @@ static BOOL rdp_write_window_activation_capability_set(wStream* s, const rdpSett #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_window_activation_capability_set(wStream* s) { - UINT16 helpKeyFlag; - UINT16 helpKeyIndexFlag; - UINT16 helpExtendedKeyFlag; - UINT16 windowManagerKeyFlag; + UINT16 helpKeyFlag = 0; + UINT16 helpKeyIndexFlag = 0; + UINT16 helpExtendedKeyFlag = 0; + UINT16 windowManagerKeyFlag = 0; WLog_VRB(TAG, "WindowActivationCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); @@ -1116,9 +1116,9 @@ static BOOL rdp_write_pointer_capability_set(wStream* s, const rdpSettings* sett #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_pointer_capability_set(wStream* s) { - UINT16 colorPointerFlag; - UINT16 colorPointerCacheSize; - UINT16 pointerCacheSize; + UINT16 colorPointerFlag = 0; + UINT16 colorPointerCacheSize = 0; + UINT16 pointerCacheSize = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 6)) return FALSE; @@ -1240,8 +1240,8 @@ static BOOL rdp_write_color_cache_capability_set(wStream* s, const rdpSettings* #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_color_cache_capability_set(wStream* s) { - UINT16 colorTableCacheSize; - UINT16 pad2Octets; + UINT16 colorTableCacheSize = 0; + UINT16 pad2Octets = 0; WLog_VRB(TAG, "ColorCacheCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) @@ -1272,7 +1272,7 @@ static BOOL rdp_apply_sound_capability_set(rdpSettings* settings, const rdpSetti static BOOL rdp_read_sound_capability_set(wStream* s, rdpSettings* settings) { - UINT16 soundFlags; + UINT16 soundFlags = 0; WINPR_ASSERT(settings); if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) @@ -1305,8 +1305,8 @@ static BOOL rdp_write_sound_capability_set(wStream* s, const rdpSettings* settin #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_sound_capability_set(wStream* s) { - UINT16 soundFlags; - UINT16 pad2OctetsA; + UINT16 soundFlags = 0; + UINT16 pad2OctetsA = 0; WLog_VRB(TAG, "SoundCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) @@ -1370,7 +1370,7 @@ static BOOL rdp_apply_input_capability_set(rdpSettings* settings, const rdpSetti static BOOL rdp_read_input_capability_set(wStream* s, rdpSettings* settings) { - UINT16 inputFlags; + UINT16 inputFlags = 0; WINPR_ASSERT(settings); if (!Stream_CheckAndLogRequiredLength(TAG, s, 84)) @@ -1473,12 +1473,12 @@ static BOOL rdp_write_input_capability_set(wStream* s, const rdpSettings* settin #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_input_capability_set(wStream* s) { - UINT16 inputFlags; - UINT16 pad2OctetsA; - UINT32 keyboardLayout; - UINT32 keyboardType; - UINT32 keyboardSubType; - UINT32 keyboardFunctionKey; + UINT16 inputFlags = 0; + UINT16 pad2OctetsA = 0; + UINT32 keyboardLayout = 0; + UINT32 keyboardType = 0; + UINT32 keyboardSubType = 0; + UINT32 keyboardFunctionKey = 0; WLog_VRB(TAG, "InputCapabilitySet (length %" PRIuz ")", Stream_GetRemainingLength(s)); if (!Stream_CheckAndLogRequiredLength(TAG, s, 84)) @@ -1644,7 +1644,7 @@ static void rdp_write_cache_definition(wStream* s, GLYPH_CACHE_DEFINITION* cache static BOOL rdp_apply_glyph_cache_capability_set(rdpSettings* settings, const rdpSettings* src) { - size_t x; + size_t x = 0; WINPR_ASSERT(settings); WINPR_ASSERT(src); @@ -1669,7 +1669,7 @@ static BOOL rdp_apply_glyph_cache_capability_set(rdpSettings* settings, const rd static BOOL rdp_read_glyph_cache_capability_set(wStream* s, rdpSettings* settings) { - size_t x; + size_t x = 0; WINPR_ASSERT(settings); if (!Stream_CheckAndLogRequiredLength(TAG, s, 48)) return FALSE; @@ -1780,7 +1780,7 @@ static BOOL rdp_apply_offscreen_bitmap_cache_capability_set(rdpSettings* setting static BOOL rdp_read_offscreen_bitmap_cache_capability_set(wStream* s, rdpSettings* settings) { - UINT32 offscreenSupportLevel; + UINT32 offscreenSupportLevel = 0; WINPR_ASSERT(settings); if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) @@ -1860,7 +1860,7 @@ static BOOL rdp_apply_bitmap_cache_host_support_capability_set(rdpSettings* sett static BOOL rdp_read_bitmap_cache_host_support_capability_set(wStream* s, rdpSettings* settings) { - BYTE cacheVersion; + BYTE cacheVersion = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) return FALSE; @@ -1899,9 +1899,9 @@ static BOOL rdp_write_bitmap_cache_host_support_capability_set(wStream* s, #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_bitmap_cache_host_support_capability_set(wStream* s) { - BYTE cacheVersion; - BYTE pad1; - UINT16 pad2; + BYTE cacheVersion = 0; + BYTE pad1 = 0; + UINT16 pad2 = 0; WLog_VRB(TAG, "BitmapCacheHostSupportCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); @@ -1920,7 +1920,7 @@ static BOOL rdp_print_bitmap_cache_host_support_capability_set(wStream* s) static BOOL rdp_read_bitmap_cache_cell_info(wStream* s, BITMAP_CACHE_V2_CELL_INFO* cellInfo) { - UINT32 info; + UINT32 info = 0; WINPR_ASSERT(cellInfo); if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) @@ -1938,7 +1938,7 @@ static BOOL rdp_read_bitmap_cache_cell_info(wStream* s, BITMAP_CACHE_V2_CELL_INF static void rdp_write_bitmap_cache_cell_info(wStream* s, BITMAP_CACHE_V2_CELL_INFO* cellInfo) { - UINT32 info; + UINT32 info = 0; /* * numEntries is in the first 31 bits, while the last bit (k) * is used to indicate a persistent bitmap cache. @@ -1988,7 +1988,7 @@ static BOOL rdp_apply_bitmap_cache_v2_capability_set(rdpSettings* settings, cons static BOOL rdp_read_bitmap_cache_v2_capability_set(wStream* s, rdpSettings* settings) { - size_t x; + size_t x = 0; UINT16 cacheFlags = 0; WINPR_UNUSED(settings); WINPR_ASSERT(settings); @@ -2061,9 +2061,9 @@ static BOOL rdp_write_bitmap_cache_v2_capability_set(wStream* s, const rdpSettin #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_bitmap_cache_v2_capability_set(wStream* s) { - UINT16 cacheFlags; - BYTE pad2; - BYTE numCellCaches; + UINT16 cacheFlags = 0; + BYTE pad2 = 0; + BYTE numCellCaches = 0; BITMAP_CACHE_V2_CELL_INFO bitmapCacheV2CellInfo[5]; WLog_VRB(TAG, "BitmapCacheV2CapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); @@ -2144,8 +2144,8 @@ static BOOL rdp_apply_virtual_channel_capability_set(rdpSettings* settings, cons static BOOL rdp_read_virtual_channel_capability_set(wStream* s, rdpSettings* settings) { - UINT32 flags; - UINT32 VCChunkSize; + UINT32 flags = 0; + UINT32 VCChunkSize = 0; WINPR_ASSERT(settings); if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) @@ -2224,7 +2224,7 @@ static BOOL rdp_apply_draw_nine_grid_cache_capability_set(rdpSettings* settings, static BOOL rdp_read_draw_nine_grid_cache_capability_set(wStream* s, rdpSettings* settings) { - UINT32 drawNineGridSupportLevel; + UINT32 drawNineGridSupportLevel = 0; WINPR_ASSERT(settings); if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) @@ -2293,9 +2293,9 @@ static void rdp_write_gdiplus_image_cache_properties(wStream* s, UINT16 oiccs, U #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_draw_nine_grid_cache_capability_set(wStream* s) { - UINT32 drawNineGridSupportLevel; - UINT16 DrawNineGridCacheSize; - UINT16 DrawNineGridCacheEntries; + UINT32 drawNineGridSupportLevel = 0; + UINT16 DrawNineGridCacheSize = 0; + UINT16 DrawNineGridCacheEntries = 0; WLog_VRB(TAG, "DrawNineGridCacheCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); @@ -2331,8 +2331,8 @@ static BOOL rdp_apply_draw_gdiplus_cache_capability_set(rdpSettings* settings, static BOOL rdp_read_draw_gdiplus_cache_capability_set(wStream* s, rdpSettings* settings) { - UINT32 drawGDIPlusSupportLevel; - UINT32 drawGdiplusCacheLevel; + UINT32 drawGDIPlusSupportLevel = 0; + UINT32 drawGdiplusCacheLevel = 0; WINPR_ASSERT(settings); if (!Stream_CheckAndLogRequiredLength(TAG, s, 36)) @@ -2383,9 +2383,9 @@ static BOOL rdp_write_draw_gdiplus_cache_capability_set(wStream* s, const rdpSet #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_draw_gdiplus_cache_capability_set(wStream* s) { - UINT32 drawGdiPlusSupportLevel; - UINT32 GdipVersion; - UINT32 drawGdiplusCacheLevel; + UINT32 drawGdiPlusSupportLevel = 0; + UINT32 GdipVersion = 0; + UINT32 drawGdiplusCacheLevel = 0; WLog_VRB(TAG, "DrawGdiPlusCacheCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); @@ -2429,7 +2429,7 @@ static BOOL rdp_apply_remote_programs_capability_set(rdpSettings* settings, cons static BOOL rdp_read_remote_programs_capability_set(wStream* s, rdpSettings* settings) { - UINT32 railSupportLevel; + UINT32 railSupportLevel = 0; WINPR_ASSERT(settings); if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) @@ -2477,7 +2477,7 @@ static BOOL rdp_write_remote_programs_capability_set(wStream* s, const rdpSettin #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_remote_programs_capability_set(wStream* s) { - UINT32 railSupportLevel; + UINT32 railSupportLevel = 0; WLog_VRB(TAG, "RemoteProgramsCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) @@ -2541,9 +2541,9 @@ static BOOL rdp_write_window_list_capability_set(wStream* s, const rdpSettings* #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_window_list_capability_set(wStream* s) { - UINT32 wndSupportLevel; - BYTE numIconCaches; - UINT16 numIconCacheEntries; + UINT32 wndSupportLevel = 0; + BYTE numIconCaches = 0; + UINT16 numIconCacheEntries = 0; WLog_VRB(TAG, "WindowListCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); if (!Stream_CheckAndLogRequiredLength(TAG, s, 7)) @@ -2608,7 +2608,7 @@ static BOOL rdp_write_desktop_composition_capability_set(wStream* s, const rdpSe #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_desktop_composition_capability_set(wStream* s) { - UINT16 compDeskSupportLevel; + UINT16 compDeskSupportLevel = 0; WLog_VRB(TAG, "DesktopCompositionCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); @@ -2624,7 +2624,7 @@ static BOOL rdp_print_desktop_composition_capability_set(wStream* s) static BOOL rdp_apply_multifragment_update_capability_set(rdpSettings* settings, const rdpSettings* src) { - UINT32 multifragMaxRequestSize; + UINT32 multifragMaxRequestSize = 0; WINPR_ASSERT(settings); WINPR_ASSERT(src); @@ -2690,7 +2690,7 @@ static BOOL rdp_apply_multifragment_update_capability_set(rdpSettings* settings, static BOOL rdp_read_multifragment_update_capability_set(wStream* s, rdpSettings* settings) { - UINT32 multifragMaxRequestSize; + UINT32 multifragMaxRequestSize = 0; WINPR_ASSERT(settings); if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) @@ -2740,7 +2740,7 @@ static BOOL rdp_write_multifragment_update_capability_set(wStream* s, rdpSetting #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_multifragment_update_capability_set(wStream* s) { - UINT32 maxRequestSize; + UINT32 maxRequestSize = 0; WLog_VRB(TAG, "MultifragmentUpdateCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); @@ -2769,7 +2769,7 @@ static BOOL rdp_apply_large_pointer_capability_set(rdpSettings* settings, const static BOOL rdp_read_large_pointer_capability_set(wStream* s, rdpSettings* settings) { - UINT16 largePointerSupportFlags; + UINT16 largePointerSupportFlags = 0; WINPR_ASSERT(settings); if (!Stream_CheckAndLogRequiredLength(TAG, s, 2)) @@ -2809,7 +2809,7 @@ static BOOL rdp_write_large_pointer_capability_set(wStream* s, const rdpSettings #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_large_pointer_capability_set(wStream* s) { - UINT16 largePointerSupportFlags; + UINT16 largePointerSupportFlags = 0; WLog_VRB(TAG, "LargePointerCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); if (!Stream_CheckAndLogRequiredLength(TAG, s, 2)) @@ -2851,7 +2851,7 @@ static BOOL rdp_apply_surface_commands_capability_set(rdpSettings* settings, con static BOOL rdp_read_surface_commands_capability_set(wStream* s, rdpSettings* settings) { - UINT32 cmdFlags; + UINT32 cmdFlags = 0; WINPR_ASSERT(settings); if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) @@ -2917,7 +2917,7 @@ static void rdp_print_bitmap_codec_guid(const GUID* guid) static char* rdp_get_bitmap_codec_guid_name(const GUID* guid) { - RPC_STATUS rpc_status; + RPC_STATUS rpc_status = 0; WINPR_ASSERT(guid); if (UuidEqual(guid, &CODEC_GUID_REMOTEFX, &rpc_status)) @@ -3016,7 +3016,7 @@ static BOOL rdp_read_bitmap_codecs_capability_set(wStream* s, rdpSettings* setti { BYTE codecId = 0; GUID codecGuid = { 0 }; - RPC_STATUS rpc_status; + RPC_STATUS rpc_status = 0; BYTE bitmapCodecCount = 0; UINT16 codecPropertiesLength = 0; @@ -3064,13 +3064,13 @@ static BOOL rdp_read_bitmap_codecs_capability_set(wStream* s, rdpSettings* setti if (rfxCapsLength) { - UINT16 blockType; - UINT32 blockLen; - UINT16 numCapsets; - BYTE rfxCodecId; - UINT16 capsetType; - UINT16 numIcaps; - UINT16 icapLen; + UINT16 blockType = 0; + UINT32 blockLen = 0; + UINT16 numCapsets = 0; + BYTE rfxCodecId = 0; + UINT16 capsetType = 0; + UINT16 numIcaps = 0; + UINT16 icapLen = 0; /* TS_RFX_CAPS */ if (!Stream_CheckAndLogRequiredLength(TAG, sub, 21)) return FALSE; @@ -3106,12 +3106,12 @@ static BOOL rdp_read_bitmap_codecs_capability_set(wStream* s, rdpSettings* setti while (numIcaps--) { - UINT16 version; - UINT16 tileSize; - BYTE codecFlags; - BYTE colConvBits; - BYTE transformBits; - BYTE entropyBits; + UINT16 version = 0; + UINT16 tileSize = 0; + BYTE codecFlags = 0; + BYTE colConvBits = 0; + BYTE transformBits = 0; + BYTE entropyBits = 0; /* TS_RFX_ICAP */ if (!Stream_CheckAndLogRequiredLength(TAG, sub, 8)) return FALSE; @@ -3154,9 +3154,9 @@ static BOOL rdp_read_bitmap_codecs_capability_set(wStream* s, rdpSettings* setti } else if (UuidEqual(&codecGuid, &CODEC_GUID_NSCODEC, &rpc_status)) { - BYTE colorLossLevel; - BYTE fAllowSubsampling; - BYTE fAllowDynamicFidelity; + BYTE colorLossLevel = 0; + BYTE fAllowSubsampling = 0; + BYTE fAllowDynamicFidelity = 0; guidNSCodec = TRUE; settings->NSCodecId = codecId; if (!Stream_CheckAndLogRequiredLength(TAG, sub, 3)) @@ -3217,8 +3217,8 @@ static BOOL rdp_read_bitmap_codecs_capability_set(wStream* s, rdpSettings* setti */ static BOOL rdp_write_rfx_client_capability_container(wStream* s, const rdpSettings* settings) { - UINT32 captureFlags; - BYTE codecMode; + UINT32 captureFlags = 0; + BYTE codecMode = 0; WINPR_ASSERT(settings); if (!Stream_EnsureRemainingCapacity(s, 64)) @@ -3264,9 +3264,9 @@ static BOOL rdp_write_rfx_client_capability_container(wStream* s, const rdpSetti */ static BOOL rdp_write_nsc_client_capability_container(wStream* s, const rdpSettings* settings) { - BYTE colorLossLevel; - BYTE fAllowSubsampling; - BYTE fAllowDynamicFidelity; + BYTE colorLossLevel = 0; + BYTE fAllowSubsampling = 0; + BYTE fAllowDynamicFidelity = 0; WINPR_ASSERT(settings); @@ -3552,7 +3552,7 @@ static BOOL rdp_write_frame_acknowledge_capability_set(wStream* s, const rdpSett #ifdef WITH_DEBUG_CAPABILITIES static BOOL rdp_print_frame_acknowledge_capability_set(wStream* s) { - UINT32 frameAcknowledge; + UINT32 frameAcknowledge = 0; WLog_VRB(TAG, "FrameAcknowledgeCapabilitySet (length %" PRIuz "):", Stream_GetRemainingLength(s)); @@ -3577,7 +3577,7 @@ static BOOL rdp_apply_bitmap_cache_v3_codec_id_capability_set(rdpSettings* setti static BOOL rdp_read_bitmap_cache_v3_codec_id_capability_set(wStream* s, rdpSettings* settings) { - BYTE bitmapCacheV3CodecId; + BYTE bitmapCacheV3CodecId = 0; WINPR_ASSERT(settings); if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) @@ -3643,9 +3643,9 @@ BOOL rdp_print_capability_sets(wStream* s, size_t start, BOOL receiving) while (numberCapabilities > 0) { - size_t rest; + size_t rest = 0; wStream subBuffer; - wStream* sub; + wStream* sub = NULL; if (!rdp_read_capability_set_header(s, &length, &type)) goto fail; @@ -4170,11 +4170,11 @@ static BOOL rdp_read_capability_sets(wStream* s, rdpSettings* settings, rdpSetti UINT16 totalLength) { BOOL rc = FALSE; - size_t start; - size_t end; - size_t len; - UINT16 numberCapabilities; - UINT16 count; + size_t start = 0; + size_t end = 0; + size_t len = 0; + UINT16 numberCapabilities = 0; + UINT16 count = 0; #ifdef WITH_DEBUG_CAPABILITIES const size_t capstart = Stream_GetPosition(s); @@ -4193,10 +4193,10 @@ static BOOL rdp_read_capability_sets(wStream* s, rdpSettings* settings, rdpSetti start = Stream_GetPosition(s); while (numberCapabilities > 0 && Stream_GetRemainingLength(s) >= 4) { - UINT16 type; - UINT16 length; + UINT16 type = 0; + UINT16 length = 0; wStream subbuffer; - wStream* sub; + wStream* sub = NULL; if (!rdp_read_capability_set_header(s, &length, &type)) goto fail; @@ -4323,11 +4323,11 @@ BOOL rdp_recv_demand_active(rdpRdp* rdp, wStream* s, UINT16 pduSource, UINT16 le static BOOL rdp_write_demand_active(wStream* s, rdpSettings* settings) { - size_t bm; - size_t em; - size_t lm; - UINT16 numberCapabilities; - size_t lengthCombinedCapabilities; + size_t bm = 0; + size_t em = 0; + size_t lm = 0; + UINT16 numberCapabilities = 0; + size_t lengthCombinedCapabilities = 0; if (!Stream_EnsureRemainingCapacity(s, 64)) return FALSE; @@ -4397,7 +4397,7 @@ static BOOL rdp_write_demand_active(wStream* s, rdpSettings* settings) BOOL rdp_send_demand_active(rdpRdp* rdp) { wStream* s = rdp_send_stream_pdu_init(rdp); - BOOL status; + BOOL status = 0; if (!s) return FALSE; @@ -4411,9 +4411,9 @@ BOOL rdp_send_demand_active(rdpRdp* rdp) BOOL rdp_recv_confirm_active(rdpRdp* rdp, wStream* s, UINT16 pduLength) { - rdpSettings* settings; - UINT16 lengthSourceDescriptor; - UINT16 lengthCombinedCapabilities; + rdpSettings* settings = NULL; + UINT16 lengthSourceDescriptor = 0; + UINT16 lengthCombinedCapabilities = 0; WINPR_ASSERT(rdp); WINPR_ASSERT(s); @@ -4480,13 +4480,13 @@ BOOL rdp_recv_confirm_active(rdpRdp* rdp, wStream* s, UINT16 pduLength) static BOOL rdp_write_confirm_active(wStream* s, rdpSettings* settings) { - size_t bm; - size_t em; - size_t lm; - UINT16 numberCapabilities; - UINT16 lengthSourceDescriptor; - size_t lengthCombinedCapabilities; - BOOL ret; + size_t bm = 0; + size_t em = 0; + size_t lm = 0; + UINT16 numberCapabilities = 0; + UINT16 lengthSourceDescriptor = 0; + size_t lengthCombinedCapabilities = 0; + BOOL ret = 0; WINPR_ASSERT(settings); @@ -4633,7 +4633,7 @@ static BOOL rdp_write_confirm_active(wStream* s, rdpSettings* settings) BOOL rdp_send_confirm_active(rdpRdp* rdp) { wStream* s = rdp_send_stream_pdu_init(rdp); - BOOL status; + BOOL status = 0; if (!s) return FALSE; diff --git a/libfreerdp/core/channels.c b/libfreerdp/core/channels.c index c2d8db9c1..ad88169ea 100644 --- a/libfreerdp/core/channels.c +++ b/libfreerdp/core/channels.c @@ -52,11 +52,11 @@ BOOL freerdp_channel_send(rdpRdp* rdp, UINT16 channelId, const BYTE* data, size_t size) { - DWORD i; - size_t left; - UINT32 flags; - size_t chunkSize; - rdpMcs* mcs; + DWORD i = 0; + size_t left = 0; + UINT32 flags = 0; + size_t chunkSize = 0; + rdpMcs* mcs = NULL; const rdpMcsChannel* channel = NULL; WINPR_ASSERT(rdp); @@ -114,9 +114,9 @@ BOOL freerdp_channel_send(rdpRdp* rdp, UINT16 channelId, const BYTE* data, size_ BOOL freerdp_channel_process(freerdp* instance, wStream* s, UINT16 channelId, size_t packetLength) { BOOL rc = FALSE; - UINT32 length; - UINT32 flags; - size_t chunkLength; + UINT32 length = 0; + UINT32 flags = 0; + size_t chunkLength = 0; WINPR_ASSERT(instance); @@ -158,9 +158,9 @@ BOOL freerdp_channel_process(freerdp* instance, wStream* s, UINT16 channelId, si BOOL freerdp_channel_peer_process(freerdp_peer* client, wStream* s, UINT16 channelId) { - UINT32 length; - UINT32 flags; - size_t chunkLength; + UINT32 length = 0; + UINT32 flags = 0; + size_t chunkLength = 0; WINPR_ASSERT(client); WINPR_ASSERT(s); @@ -174,8 +174,8 @@ BOOL freerdp_channel_peer_process(freerdp_peer* client, wStream* s, UINT16 chann if (client->VirtualChannelRead) { - int rc; - UINT32 index; + int rc = 0; + UINT32 index = 0; BOOL found = FALSE; HANDLE hChannel = 0; rdpContext* context = client->context; diff --git a/libfreerdp/core/childsession.c b/libfreerdp/core/childsession.c index c429c613e..3bed26269 100644 --- a/libfreerdp/core/childsession.c +++ b/libfreerdp/core/childsession.c @@ -68,7 +68,7 @@ static int transport_bio_named_read(BIO* bio, char* buf, int size) BIO_clear_flags(bio, BIO_FLAGS_READ); - DWORD readBytes; + DWORD readBytes = 0; BOOL ret = ReadFile(ptr->hFile, buf, size, &readBytes, NULL); WLog_VRB(TAG, "transport_bio_named_read(%d)=%d read=%d", size, ret, readBytes); if (!ret) @@ -205,7 +205,7 @@ static int transport_bio_named_new(BIO* bio) static int transport_bio_named_free(BIO* bio) { - WINPR_BIO_NAMED* ptr; + WINPR_BIO_NAMED* ptr = NULL; if (!bio) return 0; @@ -252,7 +252,7 @@ static BOOL createChildSessionTransport(HANDLE* pFile) BOOL ret = FALSE; *pFile = INVALID_HANDLE_VALUE; - BOOL childEnabled; + BOOL childEnabled = 0; if (!WTSIsChildSessionsEnabled(&childEnabled)) { WLog_ERR(TAG, "error when calling WTSIsChildSessionsEnabled"); diff --git a/libfreerdp/core/client.c b/libfreerdp/core/client.c index febf0ef65..722bb8c95 100644 --- a/libfreerdp/core/client.c +++ b/libfreerdp/core/client.c @@ -50,8 +50,8 @@ static BOOL freerdp_channels_process_message_free(wMessage* message, DWORD type) static CHANNEL_OPEN_DATA* freerdp_channels_find_channel_open_data_by_name(rdpChannels* channels, const char* name) { - int index; - CHANNEL_OPEN_DATA* pChannelOpenData; + int index = 0; + CHANNEL_OPEN_DATA* pChannelOpenData = NULL; for (index = 0; index < channels->openDataCount; index++) { @@ -67,7 +67,7 @@ static CHANNEL_OPEN_DATA* freerdp_channels_find_channel_open_data_by_name(rdpCha /* returns rdpChannel for the channel name passed in */ static rdpMcsChannel* freerdp_channels_find_channel_by_name(rdpRdp* rdp, const char* name) { - UINT32 index; + UINT32 index = 0; rdpMcs* mcs = NULL; if (!rdp) @@ -90,7 +90,7 @@ static rdpMcsChannel* freerdp_channels_find_channel_by_name(rdpRdp* rdp, const c static rdpMcsChannel* freerdp_channels_find_channel_by_id(rdpRdp* rdp, UINT16 channel_id) { - UINT32 index; + UINT32 index = 0; rdpMcsChannel* channel = NULL; rdpMcs* mcs = NULL; @@ -114,7 +114,7 @@ static rdpMcsChannel* freerdp_channels_find_channel_by_id(rdpRdp* rdp, UINT16 ch static void channel_queue_message_free(wMessage* msg) { - CHANNEL_OPEN_EVENT* ev; + CHANNEL_OPEN_EVENT* ev = NULL; if (!msg || (msg->id != 0)) return; @@ -138,8 +138,8 @@ static BOOL CALLBACK init_channel_handles_table(PINIT_ONCE once, PVOID param, PV rdpChannels* freerdp_channels_new(freerdp* instance) { - wObject* obj; - rdpChannels* channels; + wObject* obj = NULL; + rdpChannels* channels = NULL; channels = (rdpChannels*)calloc(1, sizeof(rdpChannels)); if (!channels) @@ -265,8 +265,8 @@ void freerdp_channels_register_instance(rdpChannels* channels, freerdp* instance UINT freerdp_channels_pre_connect(rdpChannels* channels, freerdp* instance) { UINT error = CHANNEL_RC_OK; - int index; - CHANNEL_CLIENT_DATA* pChannelClientData; + int index = 0; + CHANNEL_CLIENT_DATA* pChannelClientData = NULL; MessageQueue_Clear(channels->queue); @@ -296,11 +296,11 @@ UINT freerdp_channels_pre_connect(rdpChannels* channels, freerdp* instance) UINT freerdp_channels_attach(freerdp* instance) { UINT error = CHANNEL_RC_OK; - int index; - const char* hostname; - size_t hostnameLength; - rdpChannels* channels; - CHANNEL_CLIENT_DATA* pChannelClientData; + int index = 0; + const char* hostname = NULL; + size_t hostnameLength = 0; + rdpChannels* channels = NULL; + CHANNEL_CLIENT_DATA* pChannelClientData = NULL; WINPR_ASSERT(instance); WINPR_ASSERT(instance->context); @@ -355,12 +355,12 @@ fail: UINT freerdp_channels_detach(freerdp* instance) { UINT error = CHANNEL_RC_OK; - int index; - const char* hostname; - size_t hostnameLength; - rdpChannels* channels; - rdpContext* context; - CHANNEL_CLIENT_DATA* pChannelClientData; + int index = 0; + const char* hostname = NULL; + size_t hostnameLength = 0; + rdpChannels* channels = NULL; + rdpContext* context = NULL; + CHANNEL_CLIENT_DATA* pChannelClientData = NULL; WINPR_ASSERT(instance); @@ -384,7 +384,7 @@ UINT freerdp_channels_detach(freerdp* instance) } cnv; ChannelDetachedEventArgs e = { 0 }; - CHANNEL_OPEN_DATA* pChannelOpenData; + CHANNEL_OPEN_DATA* pChannelOpenData = NULL; cnv.cpv = hostname; pChannelClientData = &channels->clientDataList[index]; @@ -424,10 +424,10 @@ fail: UINT freerdp_channels_post_connect(rdpChannels* channels, freerdp* instance) { UINT error = CHANNEL_RC_OK; - int index; - const char* hostname; - size_t hostnameLength; - CHANNEL_CLIENT_DATA* pChannelClientData; + int index = 0; + const char* hostname = NULL; + size_t hostnameLength = 0; + CHANNEL_CLIENT_DATA* pChannelClientData = NULL; WINPR_ASSERT(channels); WINPR_ASSERT(instance); @@ -447,7 +447,7 @@ UINT freerdp_channels_post_connect(rdpChannels* channels, freerdp* instance) void* pb; } cnv; ChannelConnectedEventArgs e = { 0 }; - CHANNEL_OPEN_DATA* pChannelOpenData; + CHANNEL_OPEN_DATA* pChannelOpenData = NULL; pChannelClientData = &channels->clientDataList[index]; cnv.pcb = hostname; @@ -494,11 +494,11 @@ fail: BOOL freerdp_channels_data(freerdp* instance, UINT16 channelId, const BYTE* cdata, size_t dataSize, UINT32 flags, size_t totalSize) { - UINT32 index; - rdpMcs* mcs; - rdpChannels* channels; + UINT32 index = 0; + rdpMcs* mcs = NULL; + rdpChannels* channels = NULL; rdpMcsChannel* channel = NULL; - CHANNEL_OPEN_DATA* pChannelOpenData; + CHANNEL_OPEN_DATA* pChannelOpenData = NULL; union { const BYTE* pcb; @@ -562,7 +562,7 @@ BOOL freerdp_channels_data(freerdp* instance, UINT16 channelId, const BYTE* cdat UINT16 freerdp_channels_get_id_by_name(freerdp* instance, const char* channel_name) { - rdpMcsChannel* mcsChannel; + rdpMcsChannel* mcsChannel = NULL; if (!instance || !channel_name) return -1; @@ -575,7 +575,7 @@ UINT16 freerdp_channels_get_id_by_name(freerdp* instance, const char* channel_na const char* freerdp_channels_get_name_by_id(freerdp* instance, UINT16 channelId) { - rdpMcsChannel* mcsChannel; + rdpMcsChannel* mcsChannel = NULL; if (!instance) return NULL; @@ -595,7 +595,7 @@ BOOL freerdp_channels_process_message_free(wMessage* message, DWORD type) if (message->id == 0) { - CHANNEL_OPEN_DATA* pChannelOpenData; + CHANNEL_OPEN_DATA* pChannelOpenData = NULL; CHANNEL_OPEN_EVENT* item = (CHANNEL_OPEN_EVENT*)message->wParam; if (!item) @@ -632,8 +632,8 @@ static BOOL freerdp_channels_process_message(freerdp* instance, wMessage* messag goto fail; else if (message->id == 0) { - rdpMcsChannel* channel; - CHANNEL_OPEN_DATA* pChannelOpenData; + rdpMcsChannel* channel = NULL; + CHANNEL_OPEN_DATA* pChannelOpenData = NULL; CHANNEL_OPEN_EVENT* item = (CHANNEL_OPEN_EVENT*)message->wParam; if (!item) @@ -686,7 +686,7 @@ static int freerdp_channels_process_sync(rdpChannels* channels, freerdp* instanc BOOL freerdp_channels_get_fds(rdpChannels* channels, freerdp* instance, void** read_fds, int* read_count, void** write_fds, int* write_count) { - void* pfd; + void* pfd = NULL; pfd = GetEventWaitObject(MessageQueue_Event(channels->queue)); if (pfd) @@ -702,7 +702,7 @@ BOOL freerdp_channels_get_fds(rdpChannels* channels, freerdp* instance, void** r void* freerdp_channels_get_static_channel_interface(rdpChannels* channels, const char* name) { void* pInterface = NULL; - CHANNEL_OPEN_DATA* pChannelOpenData; + CHANNEL_OPEN_DATA* pChannelOpenData = NULL; pChannelOpenData = freerdp_channels_find_channel_open_data_by_name(channels, name); if (pChannelOpenData) @@ -714,7 +714,7 @@ void* freerdp_channels_get_static_channel_interface(rdpChannels* channels, const HANDLE freerdp_channels_get_event_handle(freerdp* instance) { HANDLE event = NULL; - rdpChannels* channels; + rdpChannels* channels = NULL; channels = instance->context->channels; event = MessageQueue_Event(channels->queue); return event; @@ -722,7 +722,7 @@ HANDLE freerdp_channels_get_event_handle(freerdp* instance) int freerdp_channels_process_pending_messages(freerdp* instance) { - rdpChannels* channels; + rdpChannels* channels = NULL; channels = instance->context->channels; if (WaitForSingleObject(MessageQueue_Event(channels->queue), 0) == WAIT_OBJECT_0) @@ -749,9 +749,9 @@ BOOL freerdp_channels_check_fds(rdpChannels* channels, freerdp* instance) UINT freerdp_channels_disconnect(rdpChannels* channels, freerdp* instance) { UINT error = CHANNEL_RC_OK; - int index; - CHANNEL_OPEN_DATA* pChannelOpenData; - CHANNEL_CLIENT_DATA* pChannelClientData; + int index = 0; + CHANNEL_OPEN_DATA* pChannelOpenData = NULL; + CHANNEL_CLIENT_DATA* pChannelClientData = NULL; if (!channels->connected) return 0; @@ -792,9 +792,9 @@ UINT freerdp_channels_disconnect(rdpChannels* channels, freerdp* instance) void freerdp_channels_close(rdpChannels* channels, freerdp* instance) { - int index; - CHANNEL_OPEN_DATA* pChannelOpenData; - CHANNEL_CLIENT_DATA* pChannelClientData; + int index = 0; + CHANNEL_OPEN_DATA* pChannelOpenData = NULL; + CHANNEL_CLIENT_DATA* pChannelClientData = NULL; WINPR_ASSERT(channels); WINPR_ASSERT(instance); @@ -841,11 +841,11 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelInitEx( LPVOID lpUserParam, LPVOID clientContext, LPVOID pInitHandle, PCHANNEL_DEF pChannel, INT channelCount, ULONG versionRequested, PCHANNEL_INIT_EVENT_EX_FN pChannelInitEventProcEx) { - INT index; - rdpSettings* settings; - CHANNEL_INIT_DATA* pChannelInitData; - CHANNEL_CLIENT_DATA* pChannelClientData; - rdpChannels* channels; + INT index = 0; + rdpSettings* settings = NULL; + CHANNEL_INIT_DATA* pChannelInitData = NULL; + CHANNEL_CLIENT_DATA* pChannelClientData = NULL; + rdpChannels* channels = NULL; if (!pInitHandle) return CHANNEL_RC_BAD_INIT_HANDLE; @@ -940,14 +940,14 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelInit(LPVOID* ppInitHandle, PCHANNEL_ INT channelCount, ULONG versionRequested, PCHANNEL_INIT_EVENT_FN pChannelInitEventProc) { - INT index; - CHANNEL_DEF* channel; - rdpSettings* settings; - PCHANNEL_DEF pChannelDef; - CHANNEL_INIT_DATA* pChannelInitData; - CHANNEL_OPEN_DATA* pChannelOpenData; - CHANNEL_CLIENT_DATA* pChannelClientData; - rdpChannels* channels; + INT index = 0; + CHANNEL_DEF* channel = NULL; + rdpSettings* settings = NULL; + PCHANNEL_DEF pChannelDef = NULL; + CHANNEL_INIT_DATA* pChannelInitData = NULL; + CHANNEL_OPEN_DATA* pChannelOpenData = NULL; + CHANNEL_CLIENT_DATA* pChannelClientData = NULL; + rdpChannels* channels = NULL; /* g_Instance should have been set during freerdp_connect - otherwise VirtualChannelInit was * called from a different thread */ @@ -1035,10 +1035,10 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelOpenEx(LPVOID pInitHandle, LPDWORD pOpenHandle, PCHAR pChannelName, PCHANNEL_OPEN_EVENT_EX_FN pChannelOpenEventProcEx) { - void* pInterface; - rdpChannels* channels; - CHANNEL_INIT_DATA* pChannelInitData; - CHANNEL_OPEN_DATA* pChannelOpenData; + void* pInterface = NULL; + rdpChannels* channels = NULL; + CHANNEL_INIT_DATA* pChannelInitData = NULL; + CHANNEL_OPEN_DATA* pChannelOpenData = NULL; pChannelInitData = (CHANNEL_INIT_DATA*)pInitHandle; channels = pChannelInitData->channels; pInterface = pChannelInitData->pInterface; @@ -1071,10 +1071,10 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelOpen(LPVOID pInitHandle, LPDWORD pOp PCHAR pChannelName, PCHANNEL_OPEN_EVENT_FN pChannelOpenEventProc) { - void* pInterface; - rdpChannels* channels; - CHANNEL_INIT_DATA* pChannelInitData; - CHANNEL_OPEN_DATA* pChannelOpenData; + void* pInterface = NULL; + rdpChannels* channels = NULL; + CHANNEL_INIT_DATA* pChannelInitData = NULL; + CHANNEL_OPEN_DATA* pChannelOpenData = NULL; pChannelInitData = (CHANNEL_INIT_DATA*)pInitHandle; channels = pChannelInitData->channels; pInterface = pChannelInitData->pInterface; @@ -1124,7 +1124,7 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelCloseEx(LPVOID pInitHandle, DWORD op static UINT VCAPITYPE FreeRDP_VirtualChannelClose(DWORD openHandle) { - CHANNEL_OPEN_DATA* pChannelOpenData; + CHANNEL_OPEN_DATA* pChannelOpenData = NULL; pChannelOpenData = HashTable_GetItemValue(g_ChannelHandles, (void*)(UINT_PTR)openHandle); @@ -1253,7 +1253,7 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelWrite(DWORD openHandle, LPVOID pData static BOOL freerdp_channels_is_loaded(rdpChannels* channels, PVIRTUALCHANNELENTRY entry) { - int i; + int i = 0; for (i = 0; i < channels->clientDataCount; i++) { @@ -1268,7 +1268,7 @@ static BOOL freerdp_channels_is_loaded(rdpChannels* channels, PVIRTUALCHANNELENT static BOOL freerdp_channels_is_loaded_ex(rdpChannels* channels, PVIRTUALCHANNELENTRYEX entryEx) { - int i; + int i = 0; for (i = 0; i < channels->clientDataCount; i++) { @@ -1284,9 +1284,9 @@ static BOOL freerdp_channels_is_loaded_ex(rdpChannels* channels, PVIRTUALCHANNEL int freerdp_channels_client_load(rdpChannels* channels, rdpSettings* settings, PVIRTUALCHANNELENTRY entry, void* data) { - int status; + int status = 0; CHANNEL_ENTRY_POINTS_FREERDP EntryPoints = { 0 }; - CHANNEL_CLIENT_DATA* pChannelClientData; + CHANNEL_CLIENT_DATA* pChannelClientData = NULL; WINPR_ASSERT(channels); WINPR_ASSERT(channels->instance); @@ -1337,7 +1337,7 @@ int freerdp_channels_client_load(rdpChannels* channels, rdpSettings* settings, int freerdp_channels_client_load_ex(rdpChannels* channels, rdpSettings* settings, PVIRTUALCHANNELENTRYEX entryEx, void* data) { - int status; + int status = 0; void* pInitHandle = NULL; CHANNEL_ENTRY_POINTS_FREERDP_EX EntryPointsEx = { 0 }; CHANNEL_INIT_DATA* pChannelInitData = NULL; @@ -1398,7 +1398,7 @@ int freerdp_channels_client_load_ex(rdpChannels* channels, rdpSettings* settings int freerdp_channels_load_plugin(rdpChannels* channels, rdpSettings* settings, const char* name, void* data) { - PVIRTUALCHANNELENTRY entry; + PVIRTUALCHANNELENTRY entry = NULL; entry = freerdp_load_channel_addin_entry(name, NULL, NULL, FREERDP_ADDIN_CHANNEL_STATIC); if (!entry) diff --git a/libfreerdp/core/codecs.c b/libfreerdp/core/codecs.c index 941a5d913..bfa78900d 100644 --- a/libfreerdp/core/codecs.c +++ b/libfreerdp/core/codecs.c @@ -243,7 +243,7 @@ BOOL freerdp_client_codecs_reset(rdpCodecs* codecs, UINT32 flags, UINT32 width, rdpCodecs* codecs_new(rdpContext* context) { - rdpCodecs* codecs; + rdpCodecs* codecs = NULL; codecs = (rdpCodecs*)calloc(1, sizeof(rdpCodecs)); if (codecs) diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c index 806f619df..7e45a9034 100644 --- a/libfreerdp/core/connection.c +++ b/libfreerdp/core/connection.c @@ -198,7 +198,7 @@ static BOOL rdp_set_state(rdpRdp* rdp, CONNECTION_STATE state); static BOOL rdp_client_reset_codecs(rdpContext* context) { - rdpSettings* settings; + rdpSettings* settings = NULL; if (!context || !context->settings) return FALSE; @@ -297,9 +297,9 @@ static BOOL rdp_client_wait_for_activation(rdpRdp* rdp) BOOL rdp_client_connect(rdpRdp* rdp) { - UINT32 SelectedProtocol; - BOOL status; - rdpSettings* settings; + UINT32 SelectedProtocol = 0; + BOOL status = 0; + rdpSettings* settings = NULL; /* make sure SSL is initialize for earlier enough for crypto, by taking advantage of winpr SSL * FIPS flag for openssl initialization */ DWORD flags = WINPR_SSL_INIT_DEFAULT; @@ -473,7 +473,7 @@ BOOL rdp_client_connect(rdpRdp* rdp) BOOL rdp_client_disconnect(rdpRdp* rdp) { - rdpContext* context; + rdpContext* context = NULL; if (!rdp || !rdp->settings || !rdp->context) return FALSE; @@ -502,7 +502,7 @@ BOOL rdp_client_disconnect(rdpRdp* rdp) BOOL rdp_client_disconnect_and_clear(rdpRdp* rdp) { - rdpContext* context; + rdpContext* context = NULL; if (!rdp_client_disconnect(rdp)) return FALSE; @@ -523,7 +523,7 @@ BOOL rdp_client_disconnect_and_clear(rdpRdp* rdp) static BOOL rdp_client_reconnect_channels(rdpRdp* rdp, BOOL redirect) { BOOL status = FALSE; - rdpContext* context; + rdpContext* context = NULL; if (!rdp || !rdp->context || !rdp->context->channels) return FALSE; @@ -616,8 +616,8 @@ static BOOL rdp_client_redirect_try_netbios(rdpSettings* settings) BOOL rdp_client_redirect(rdpRdp* rdp) { - BOOL status; - rdpSettings* settings; + BOOL status = 0; + rdpSettings* settings = NULL; if (!rdp_client_disconnect_and_clear(rdp)) return FALSE; @@ -702,7 +702,7 @@ BOOL rdp_client_redirect(rdpRdp* rdp) BOOL rdp_client_reconnect(rdpRdp* rdp) { - BOOL status; + BOOL status = 0; if (!rdp_client_disconnect_and_clear(rdp)) return FALSE; @@ -1023,8 +1023,8 @@ static BOOL rdp_client_join_channel(rdpRdp* rdp, UINT16 ChannelId) BOOL rdp_client_connect_mcs_channel_join_confirm(rdpRdp* rdp, wStream* s) { - UINT32 i; - UINT16 channelId; + UINT32 i = 0; + UINT16 channelId = 0; BOOL allJoined = TRUE; WINPR_ASSERT(rdp); @@ -1176,10 +1176,10 @@ BOOL rdp_client_connect_auto_detect(rdpRdp* rdp, wStream* s) state_run_t rdp_client_connect_license(rdpRdp* rdp, wStream* s) { state_run_t status = STATE_RUN_FAILED; - LICENSE_STATE state; - UINT16 length; - UINT16 channelId; - UINT16 securityFlags; + LICENSE_STATE state = LICENSE_STATE_ABORTED; + UINT16 length = 0; + UINT16 channelId = 0; + UINT16 securityFlags = 0; WINPR_ASSERT(rdp); if (!rdp_read_header(rdp, s, &length, &channelId)) @@ -1380,10 +1380,10 @@ BOOL rdp_client_transition_to_state(rdpRdp* rdp, CONNECTION_STATE state) BOOL rdp_server_accept_nego(rdpRdp* rdp, wStream* s) { UINT32 SelectedProtocol = 0; - UINT32 RequestedProtocols; - BOOL status; - rdpSettings* settings; - rdpNego* nego; + UINT32 RequestedProtocols = 0; + BOOL status = 0; + rdpSettings* settings = NULL; + rdpNego* nego = NULL; WINPR_ASSERT(rdp); WINPR_ASSERT(s); @@ -1661,7 +1661,7 @@ BOOL rdp_server_accept_mcs_connect_initial(rdpRdp* rdp, wStream* s) WINPR_ASSERT(mcs->channels || (mcs->channelCount == 0)); for (UINT32 i = 0; i < mcs->channelCount; i++) { - ADDIN_ARGV* arg; + ADDIN_ARGV* arg = NULL; rdpMcsChannel* cur = &mcs->channels[i]; const char* params[1] = { cur->Name }; WLog_DBG(TAG, " %s [%" PRIu16 "]", cur->Name, cur->ChannelId); @@ -1738,10 +1738,10 @@ BOOL rdp_server_accept_mcs_attach_user_request(rdpRdp* rdp, wStream* s) BOOL rdp_server_accept_mcs_channel_join_request(rdpRdp* rdp, wStream* s) { - UINT32 i; - UINT16 channelId; + UINT32 i = 0; + UINT16 channelId = 0; BOOL allJoined = TRUE; - rdpMcs* mcs; + rdpMcs* mcs = NULL; WINPR_ASSERT(rdp); WINPR_ASSERT(rdp->context); @@ -1778,7 +1778,7 @@ BOOL rdp_server_accept_mcs_channel_join_request(rdpRdp* rdp, wStream* s) allJoined = FALSE; } - CONNECTION_STATE rc; + CONNECTION_STATE rc = CONNECTION_STATE_INITIAL; if ((mcs->userChannelJoined) && (mcs->globalChannelJoined) && (mcs->messageChannelId == 0 || mcs->messageChannelJoined) && allJoined) rc = CONNECTION_STATE_RDP_SECURITY_COMMENCEMENT; @@ -2053,8 +2053,8 @@ const char* rdp_get_state_string(const rdpRdp* rdp) BOOL rdp_channels_from_mcs(rdpSettings* settings, const rdpRdp* rdp) { - size_t x; - const rdpMcs* mcs; + size_t x = 0; + const rdpMcs* mcs = NULL; WINPR_ASSERT(rdp); diff --git a/libfreerdp/core/credssp_auth.c b/libfreerdp/core/credssp_auth.c index 738e8c847..63500368f 100644 --- a/libfreerdp/core/credssp_auth.c +++ b/libfreerdp/core/credssp_auth.c @@ -163,7 +163,7 @@ static BOOL credssp_auth_setup_auth_data(rdpCredsspAuth* auth, const SEC_WINNT_AUTH_IDENTITY* identity, SEC_WINNT_AUTH_IDENTITY_WINPR* pAuthData) { - SEC_WINNT_AUTH_IDENTITY_EXW* identityEx; + SEC_WINNT_AUTH_IDENTITY_EXW* identityEx = NULL; WINPR_ASSERT(pAuthData); ZeroMemory(pAuthData, sizeof(SEC_WINNT_AUTH_IDENTITY_WINPR)); @@ -693,8 +693,8 @@ UINT32 credssp_auth_sspi_error(rdpCredsspAuth* auth) void credssp_auth_free(rdpCredsspAuth* auth) { - SEC_WINPR_KERBEROS_SETTINGS* krb_settings; - SEC_WINPR_NTLM_SETTINGS* ntlm_settings; + SEC_WINPR_KERBEROS_SETTINGS* krb_settings = NULL; + SEC_WINPR_NTLM_SETTINGS* ntlm_settings = NULL; if (!auth) return; @@ -748,9 +748,9 @@ void credssp_auth_free(rdpCredsspAuth* auth) static void auth_get_sspi_module_from_reg(char** sspi_module) { - HKEY hKey; - DWORD dwType; - DWORD dwSize; + HKEY hKey = NULL; + DWORD dwType = 0; + DWORD dwSize = 0; WINPR_ASSERT(sspi_module); *sspi_module = NULL; @@ -794,7 +794,7 @@ static SecurityFunctionTable* auth_resolve_sspi_table(const rdpSettings* setting if (sspi_module || settings->SspiModule) { - INIT_SECURITY_INTERFACE InitSecurityInterface_ptr; + INIT_SECURITY_INTERFACE InitSecurityInterface_ptr = NULL; const char* module_name = sspi_module ? sspi_module : settings->SspiModule; #ifdef UNICODE const char* proc_name = "InitSecurityInterfaceW"; @@ -823,10 +823,10 @@ static SecurityFunctionTable* auth_resolve_sspi_table(const rdpSettings* setting static BOOL credssp_auth_setup_identity(rdpCredsspAuth* auth) { - const rdpSettings* settings; - SEC_WINPR_KERBEROS_SETTINGS* krb_settings; - SEC_WINPR_NTLM_SETTINGS* ntlm_settings; - freerdp_peer* peer; + const rdpSettings* settings = NULL; + SEC_WINPR_KERBEROS_SETTINGS* krb_settings = NULL; + SEC_WINPR_NTLM_SETTINGS* ntlm_settings = NULL; + freerdp_peer* peer = NULL; WINPR_ASSERT(auth); WINPR_ASSERT(auth->rdp_ctx); @@ -927,8 +927,8 @@ static BOOL credssp_auth_setup_identity(rdpCredsspAuth* auth) BOOL credssp_auth_set_spn(rdpCredsspAuth* auth, const char* service, const char* hostname) { - size_t length; - char* spn; + size_t length = 0; + char* spn = NULL; WINPR_ASSERT(auth); @@ -977,8 +977,8 @@ static const char* parseInt(const char* v, INT32* r) static BOOL parseKerberosDeltat(const char* value, INT32* dest, const char* message) { - INT32 v; - const char* ptr; + INT32 v = 0; + const char* ptr = NULL; WINPR_ASSERT(value); WINPR_ASSERT(dest); diff --git a/libfreerdp/core/display.c b/libfreerdp/core/display.c index 9e544dc37..f9de85a33 100644 --- a/libfreerdp/core/display.c +++ b/libfreerdp/core/display.c @@ -22,7 +22,7 @@ static BOOL display_write_monitor_layout_pdu(wStream* s, UINT32 monitorCount, const MONITOR_DEF* monitorDefArray) { - UINT32 index; + UINT32 index = 0; if (!Stream_EnsureRemainingCapacity(s, 4 + (monitorCount * 20))) return FALSE; @@ -47,7 +47,7 @@ BOOL display_convert_rdp_monitor_to_monitor_def(UINT32 monitorCount, const rdpMonitor* monitorDefArray, MONITOR_DEF** result) { - UINT32 index; + UINT32 index = 0; MONITOR_DEF* mdef = NULL; if (!monitorDefArray || !result || (*result)) diff --git a/libfreerdp/core/errbase.c b/libfreerdp/core/errbase.c index 3c2453165..cb04fb0d4 100644 --- a/libfreerdp/core/errbase.c +++ b/libfreerdp/core/errbase.c @@ -45,7 +45,7 @@ static const ERRINFO ERRBASE_CODES[] = { ERRBASE_DEFINE(SUCCESS), const char* freerdp_get_error_base_string(UINT32 code) { - const ERRINFO* errInfo; + const ERRINFO* errInfo = NULL; errInfo = &ERRBASE_CODES[0]; @@ -64,7 +64,7 @@ const char* freerdp_get_error_base_string(UINT32 code) const char* freerdp_get_error_base_category(UINT32 code) { - const ERRINFO* errInfo; + const ERRINFO* errInfo = NULL; errInfo = &ERRBASE_CODES[0]; @@ -83,7 +83,7 @@ const char* freerdp_get_error_base_category(UINT32 code) const char* freerdp_get_error_base_name(UINT32 code) { - const ERRINFO* errInfo; + const ERRINFO* errInfo = NULL; errInfo = &ERRBASE_CODES[0]; diff --git a/libfreerdp/core/errconnect.c b/libfreerdp/core/errconnect.c index aff1fa056..c98a3eb40 100644 --- a/libfreerdp/core/errconnect.c +++ b/libfreerdp/core/errconnect.c @@ -137,7 +137,7 @@ static const ERRINFO ERRCONNECT_CODES[] = { const char* freerdp_get_error_connect_string(UINT32 code) { - const ERRINFO* errInfo; + const ERRINFO* errInfo = NULL; errInfo = &ERRCONNECT_CODES[0]; while (errInfo->code != ERRCONNECT_NONE) @@ -155,7 +155,7 @@ const char* freerdp_get_error_connect_string(UINT32 code) const char* freerdp_get_error_connect_category(UINT32 code) { - const ERRINFO* errInfo; + const ERRINFO* errInfo = NULL; errInfo = &ERRCONNECT_CODES[0]; while (errInfo->code != ERRCONNECT_NONE) @@ -173,7 +173,7 @@ const char* freerdp_get_error_connect_category(UINT32 code) const char* freerdp_get_error_connect_name(UINT32 code) { - const ERRINFO* errInfo; + const ERRINFO* errInfo = NULL; errInfo = &ERRCONNECT_CODES[0]; while (errInfo->code != ERRCONNECT_NONE) diff --git a/libfreerdp/core/errinfo.c b/libfreerdp/core/errinfo.c index cfcd0785f..4c2baa326 100644 --- a/libfreerdp/core/errinfo.c +++ b/libfreerdp/core/errinfo.c @@ -626,7 +626,7 @@ static const ERRINFO ERRINFO_CODES[] = { const char* freerdp_get_error_info_string(UINT32 code) { - const ERRINFO* errInfo; + const ERRINFO* errInfo = NULL; errInfo = &ERRINFO_CODES[0]; while (errInfo->code != ERRINFO_NONE) @@ -644,7 +644,7 @@ const char* freerdp_get_error_info_string(UINT32 code) const char* freerdp_get_error_info_category(UINT32 code) { - const ERRINFO* errInfo; + const ERRINFO* errInfo = NULL; errInfo = &ERRINFO_CODES[0]; while (errInfo->code != ERRINFO_NONE) @@ -662,7 +662,7 @@ const char* freerdp_get_error_info_category(UINT32 code) const char* freerdp_get_error_info_name(UINT32 code) { - const ERRINFO* errInfo; + const ERRINFO* errInfo = NULL; errInfo = &ERRINFO_CODES[0]; while (errInfo->code != ERRINFO_NONE) @@ -680,7 +680,7 @@ const char* freerdp_get_error_info_name(UINT32 code) void rdp_print_errinfo(UINT32 code) { - const ERRINFO* errInfo; + const ERRINFO* errInfo = NULL; errInfo = &ERRINFO_CODES[0]; while (errInfo->code != ERRINFO_NONE) diff --git a/libfreerdp/core/fastpath.c b/libfreerdp/core/fastpath.c index b46d5a50e..3069b401e 100644 --- a/libfreerdp/core/fastpath.c +++ b/libfreerdp/core/fastpath.c @@ -106,7 +106,7 @@ static const char* fastpath_update_to_string(UINT8 update) static BOOL fastpath_read_update_header(wStream* s, BYTE* updateCode, BYTE* fragmentation, BYTE* compression) { - BYTE updateHeader; + BYTE updateHeader = 0; if (!s || !updateCode || !fragmentation || !compression) return FALSE; @@ -214,7 +214,7 @@ static UINT32 fastpath_get_update_pdu_header_size(FASTPATH_UPDATE_PDU_HEADER* fp BOOL fastpath_read_header_rdp(rdpFastPath* fastpath, wStream* s, UINT16* length) { - BYTE header; + BYTE header = 0; if (!s || !length) return FALSE; @@ -243,8 +243,8 @@ BOOL fastpath_read_header_rdp(rdpFastPath* fastpath, wStream* s, UINT16* length) static BOOL fastpath_recv_orders(rdpFastPath* fastpath, wStream* s) { - rdpUpdate* update; - UINT16 numberOrders; + rdpUpdate* update = NULL; + UINT16 numberOrders = 0; if (!fastpath || !fastpath->rdp || !s) { @@ -279,10 +279,10 @@ static BOOL fastpath_recv_orders(rdpFastPath* fastpath, wStream* s) static BOOL fastpath_recv_update_common(rdpFastPath* fastpath, wStream* s) { BOOL rc = FALSE; - UINT16 updateType; - rdpUpdate* update; - rdpContext* context; - BOOL defaultReturn; + UINT16 updateType = 0; + rdpUpdate* update = NULL; + rdpContext* context = NULL; + BOOL defaultReturn = 0; if (!fastpath || !s || !fastpath->rdp) return FALSE; @@ -567,7 +567,7 @@ static int fastpath_recv_update_data(rdpFastPath* fastpath, wStream* s) } else { - rdpContext* context; + rdpContext* context = NULL; const size_t totalSize = Stream_GetPosition(fastpath->updateData); context = transport_get_context(transport); @@ -662,7 +662,7 @@ fail: static BOOL fastpath_read_input_event_header(wStream* s, BYTE* eventFlags, BYTE* eventCode) { - BYTE eventHeader; + BYTE eventHeader = 0; WINPR_ASSERT(s); WINPR_ASSERT(eventFlags); @@ -679,9 +679,9 @@ static BOOL fastpath_read_input_event_header(wStream* s, BYTE* eventFlags, BYTE* static BOOL fastpath_recv_input_event_scancode(rdpFastPath* fastpath, wStream* s, BYTE eventFlags) { - rdpInput* input; - UINT16 flags; - UINT16 code; + rdpInput* input = NULL; + UINT16 flags = 0; + UINT16 code = 0; WINPR_ASSERT(fastpath); WINPR_ASSERT(fastpath->rdp); WINPR_ASSERT(fastpath->rdp->input); @@ -709,10 +709,10 @@ static BOOL fastpath_recv_input_event_scancode(rdpFastPath* fastpath, wStream* s static BOOL fastpath_recv_input_event_mouse(rdpFastPath* fastpath, wStream* s, BYTE eventFlags) { - rdpInput* input; - UINT16 pointerFlags; - UINT16 xPos; - UINT16 yPos; + rdpInput* input = NULL; + UINT16 pointerFlags = 0; + UINT16 xPos = 0; + UINT16 yPos = 0; WINPR_ASSERT(fastpath); WINPR_ASSERT(fastpath->rdp); WINPR_ASSERT(fastpath->rdp->input); @@ -731,10 +731,10 @@ static BOOL fastpath_recv_input_event_mouse(rdpFastPath* fastpath, wStream* s, B static BOOL fastpath_recv_input_event_relmouse(rdpFastPath* fastpath, wStream* s, BYTE eventFlags) { - rdpInput* input; - UINT16 pointerFlags; - INT16 xDelta; - INT16 yDelta; + rdpInput* input = NULL; + UINT16 pointerFlags = 0; + INT16 xDelta = 0; + INT16 yDelta = 0; WINPR_ASSERT(fastpath); WINPR_ASSERT(fastpath->rdp); WINPR_ASSERT(fastpath->rdp->context); @@ -792,10 +792,10 @@ static BOOL fastpath_recv_input_event_qoe(rdpFastPath* fastpath, wStream* s, BYT static BOOL fastpath_recv_input_event_mousex(rdpFastPath* fastpath, wStream* s, BYTE eventFlags) { - rdpInput* input; - UINT16 pointerFlags; - UINT16 xPos; - UINT16 yPos; + rdpInput* input = NULL; + UINT16 pointerFlags = 0; + UINT16 xPos = 0; + UINT16 yPos = 0; WINPR_ASSERT(fastpath); WINPR_ASSERT(fastpath->rdp); @@ -826,7 +826,7 @@ static BOOL fastpath_recv_input_event_mousex(rdpFastPath* fastpath, wStream* s, static BOOL fastpath_recv_input_event_sync(rdpFastPath* fastpath, wStream* s, BYTE eventFlags) { - rdpInput* input; + rdpInput* input = NULL; WINPR_ASSERT(fastpath); WINPR_ASSERT(fastpath->rdp); @@ -839,8 +839,8 @@ static BOOL fastpath_recv_input_event_sync(rdpFastPath* fastpath, wStream* s, BY static BOOL fastpath_recv_input_event_unicode(rdpFastPath* fastpath, wStream* s, BYTE eventFlags) { - UINT16 unicodeCode; - UINT16 flags; + UINT16 unicodeCode = 0; + UINT16 flags = 0; WINPR_ASSERT(fastpath); WINPR_ASSERT(s); @@ -863,8 +863,8 @@ static BOOL fastpath_recv_input_event_unicode(rdpFastPath* fastpath, wStream* s, static BOOL fastpath_recv_input_event(rdpFastPath* fastpath, wStream* s) { - BYTE eventFlags; - BYTE eventCode; + BYTE eventFlags = 0; + BYTE eventCode = 0; WINPR_ASSERT(fastpath); WINPR_ASSERT(s); @@ -925,7 +925,7 @@ static BOOL fastpath_recv_input_event(rdpFastPath* fastpath, wStream* s) state_run_t fastpath_recv_inputs(rdpFastPath* fastpath, wStream* s) { - BYTE i; + BYTE i = 0; WINPR_ASSERT(fastpath); WINPR_ASSERT(s); @@ -953,7 +953,7 @@ state_run_t fastpath_recv_inputs(rdpFastPath* fastpath, wStream* s) static UINT32 fastpath_get_sec_bytes(rdpRdp* rdp) { - UINT32 sec_bytes; + UINT32 sec_bytes = 0; sec_bytes = 0; if (!rdp) @@ -972,8 +972,8 @@ static UINT32 fastpath_get_sec_bytes(rdpRdp* rdp) wStream* fastpath_input_pdu_init_header(rdpFastPath* fastpath) { - rdpRdp* rdp; - wStream* s; + rdpRdp* rdp = NULL; + wStream* s = NULL; if (!fastpath || !fastpath->rdp) return NULL; @@ -1000,7 +1000,7 @@ wStream* fastpath_input_pdu_init_header(rdpFastPath* fastpath) wStream* fastpath_input_pdu_init(rdpFastPath* fastpath, BYTE eventFlags, BYTE eventCode) { - wStream* s; + wStream* s = NULL; s = fastpath_input_pdu_init_header(fastpath); if (!s) @@ -1075,7 +1075,7 @@ BOOL fastpath_send_multiple_input_pdu(rdpFastPath* fastpath, wStream* s, size_t WINPR_ASSERT(rdp->settings); if (rdp->settings->EncryptionMethods == ENCRYPTION_METHOD_FIPS) { - BYTE pad; + BYTE pad = 0; if ((pad = 8 - (fpInputEvents_length % 8)) == 8) pad = 0; @@ -1101,7 +1101,7 @@ BOOL fastpath_send_multiple_input_pdu(rdpFastPath* fastpath, wStream* s, size_t } else { - BOOL res; + BOOL res = 0; if (!Stream_CheckAndLogRequiredCapacity(TAG, s, 8)) goto unlock; if (rdp->sec_flags & SEC_SECURE_CHECKSUM) @@ -1157,7 +1157,7 @@ wStream* fastpath_update_pdu_init(rdpFastPath* fastpath) wStream* fastpath_update_pdu_init_new(rdpFastPath* fastpath) { - wStream* s; + wStream* s = NULL; s = Stream_New(NULL, FASTPATH_MAX_PACKET_SIZE); return s; } @@ -1165,17 +1165,17 @@ wStream* fastpath_update_pdu_init_new(rdpFastPath* fastpath) BOOL fastpath_send_update_pdu(rdpFastPath* fastpath, BYTE updateCode, wStream* s, BOOL skipCompression) { - int fragment; - UINT16 maxLength; - UINT32 totalLength; + int fragment = 0; + UINT16 maxLength = 0; + UINT32 totalLength = 0; BOOL status = TRUE; wStream* fs = NULL; - rdpSettings* settings; - rdpRdp* rdp; + rdpSettings* settings = NULL; + rdpRdp* rdp = NULL; UINT32 fpHeaderSize = 6; - UINT32 fpUpdatePduHeaderSize; - UINT32 fpUpdateHeaderSize; - UINT32 CompressionMaxSize; + UINT32 fpUpdatePduHeaderSize = 0; + UINT32 fpUpdateHeaderSize = 0; + UINT32 CompressionMaxSize = 0; FASTPATH_UPDATE_PDU_HEADER fpUpdatePduHeader = { 0 }; FASTPATH_UPDATE_HEADER fpUpdateHeader = { 0 }; @@ -1228,8 +1228,8 @@ BOOL fastpath_send_update_pdu(rdpFastPath* fastpath, BYTE updateCode, wStream* s for (fragment = 0; (totalLength > 0) || (fragment == 0); fragment++) { - const BYTE* pSrcData; - UINT32 SrcSize; + const BYTE* pSrcData = NULL; + UINT32 SrcSize = 0; UINT32 DstSize = 0; const BYTE* pDstData = NULL; UINT32 compressionFlags = 0; @@ -1370,7 +1370,7 @@ BOOL fastpath_send_update_pdu(rdpFastPath* fastpath, BYTE updateCode, wStream* s rdpFastPath* fastpath_new(rdpRdp* rdp) { - rdpFastPath* fastpath; + rdpFastPath* fastpath = NULL; WINPR_ASSERT(rdp); diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c index 2ae71b09e..29d907ac4 100644 --- a/libfreerdp/core/freerdp.c +++ b/libfreerdp/core/freerdp.c @@ -83,12 +83,12 @@ static void sig_abort_connect(int signum, const char* signame, void* ctx) */ static int freerdp_connect_begin(freerdp* instance) { - BOOL rc; + BOOL rc = 0; UINT status2 = CHANNEL_RC_OK; - rdpRdp* rdp; + rdpRdp* rdp = NULL; BOOL status = TRUE; - rdpSettings* settings; - UINT32 KeyboardLayout; + rdpSettings* settings = NULL; + UINT32 KeyboardLayout = 0; if (!instance) return -1; @@ -180,7 +180,7 @@ BOOL freerdp_connect(freerdp* instance) BOOL status = FALSE; ConnectionResultEventArgs e = { 0 }; const int rc = freerdp_connect_begin(instance); - rdpRdp* rdp; + rdpRdp* rdp = NULL; UINT status2 = ERROR_INTERNAL_ERROR; WINPR_ASSERT(instance); @@ -242,7 +242,7 @@ BOOL freerdp_connect(freerdp* instance) if (rdp->settings->PlayRemoteFx) { - wStream* s; + wStream* s = NULL; rdp_update_internal* update = update_cast(instance->context->update); pcap_record record = { 0 }; @@ -326,7 +326,7 @@ BOOL freerdp_abort_connect_context(rdpContext* context) #if defined(WITH_FREERDP_DEPRECATED) BOOL freerdp_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount) { - rdpRdp* rdp; + rdpRdp* rdp = NULL; WINPR_ASSERT(instance); WINPR_ASSERT(instance->context); @@ -341,8 +341,8 @@ BOOL freerdp_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, i BOOL freerdp_check_fds(freerdp* instance) { - int status; - rdpRdp* rdp; + int status = 0; + rdpRdp* rdp = NULL; if (!instance) return FALSE; @@ -520,7 +520,7 @@ HANDLE freerdp_get_message_queue_event_handle(freerdp* instance, DWORD id) int freerdp_message_queue_process_message(freerdp* instance, DWORD id, wMessage* message) { int status = -1; - rdpContext* context; + rdpContext* context = NULL; WINPR_ASSERT(instance); @@ -544,7 +544,7 @@ int freerdp_message_queue_process_message(freerdp* instance, DWORD id, wMessage* int freerdp_message_queue_process_pending_messages(freerdp* instance, DWORD id) { int status = -1; - rdpContext* context; + rdpContext* context = NULL; WINPR_ASSERT(instance); @@ -587,8 +587,8 @@ static BOOL freerdp_send_channel_packet(freerdp* instance, UINT16 channelId, siz BOOL freerdp_disconnect(freerdp* instance) { BOOL rc = TRUE; - rdpRdp* rdp; - rdp_update_internal* up; + rdpRdp* rdp = NULL; + rdp_update_internal* up = NULL; if (!instance || !instance->context) return FALSE; @@ -628,7 +628,7 @@ BOOL freerdp_disconnect_before_reconnect(freerdp* instance) BOOL freerdp_disconnect_before_reconnect_context(rdpContext* context) { - rdpRdp* rdp; + rdpRdp* rdp = NULL; WINPR_ASSERT(context); @@ -638,7 +638,7 @@ BOOL freerdp_disconnect_before_reconnect_context(rdpContext* context) BOOL freerdp_reconnect(freerdp* instance) { - rdpRdp* rdp; + rdpRdp* rdp = NULL; WINPR_ASSERT(instance); WINPR_ASSERT(instance->context); @@ -671,7 +671,7 @@ BOOL freerdp_shall_disconnect_context(rdpContext* context) BOOL freerdp_focus_required(freerdp* instance) { - rdpRdp* rdp; + rdpRdp* rdp = NULL; BOOL bRetCode = FALSE; WINPR_ASSERT(instance); @@ -691,7 +691,7 @@ BOOL freerdp_focus_required(freerdp* instance) void freerdp_set_focus(freerdp* instance) { - rdpRdp* rdp; + rdpRdp* rdp = NULL; WINPR_ASSERT(instance); WINPR_ASSERT(instance->context); @@ -763,8 +763,8 @@ BOOL freerdp_context_new(freerdp* instance) BOOL freerdp_context_new_ex(freerdp* instance, rdpSettings* settings) { - rdpRdp* rdp; - rdpContext* context; + rdpRdp* rdp = NULL; + rdpContext* context = NULL; BOOL ret = TRUE; WINPR_ASSERT(instance); @@ -873,7 +873,7 @@ BOOL freerdp_context_reset(freerdp* instance) */ void freerdp_context_free(freerdp* instance) { - rdpContext* ctx; + rdpContext* ctx = NULL; if (!instance) return; @@ -1147,7 +1147,7 @@ const char* freerdp_get_logon_error_info_data_ex(UINT32 data, char* buffer, size */ freerdp* freerdp_new(void) { - freerdp* instance; + freerdp* instance = NULL; instance = (freerdp*)calloc(1, sizeof(freerdp)); if (!instance) @@ -1178,7 +1178,7 @@ ULONG freerdp_get_transport_sent(rdpContext* context, BOOL resetCount) BOOL freerdp_nla_impersonate(rdpContext* context) { - rdpNla* nla; + rdpNla* nla = NULL; if (!context) return FALSE; @@ -1195,7 +1195,7 @@ BOOL freerdp_nla_impersonate(rdpContext* context) BOOL freerdp_nla_revert_to_self(rdpContext* context) { - rdpNla* nla; + rdpNla* nla = NULL; if (!context) return FALSE; @@ -1212,7 +1212,7 @@ BOOL freerdp_nla_revert_to_self(rdpContext* context) UINT32 freerdp_get_nla_sspi_error(rdpContext* context) { - rdpNla* nla; + rdpNla* nla = NULL; WINPR_ASSERT(context); WINPR_ASSERT(context->rdp); diff --git a/libfreerdp/core/gateway/arm.c b/libfreerdp/core/gateway/arm.c index 076c4e9d5..9848c481e 100644 --- a/libfreerdp/core/gateway/arm.c +++ b/libfreerdp/core/gateway/arm.c @@ -91,8 +91,8 @@ static BOOL arm_tls_connect(rdpArm* arm, rdpTls* tls, int timeout) return FALSE; UINT16 peerPort = (UINT16)freerdp_settings_get_uint32(settings, FreeRDP_GatewayPort); - const char* proxyUsername; - const char* proxyPassword; + const char* proxyUsername = NULL; + const char* proxyPassword = NULL; BOOL isProxyConnection = proxy_prepare(settings, &peerHostname, &peerPort, &proxyUsername, &proxyPassword); @@ -165,7 +165,7 @@ static wStream* arm_build_http_request(rdpArm* arm, const char* method, { wStream* s = NULL; HttpRequest* request = NULL; - const char* uri; + const char* uri = NULL; WINPR_ASSERT(arm); WINPR_ASSERT(method); @@ -443,7 +443,7 @@ static BOOL arm_stringEncodeW(const BYTE* pin, size_t cbIn, BYTE** ppOut, size_t return FALSE; /* and then convert to Unicode */ - size_t outSz; + size_t outSz = 0; *ppOut = (BYTE*)ConvertUtf8NToWCharAlloc(b64encoded, strlen(b64encoded), &outSz); free(b64encoded); @@ -866,7 +866,7 @@ static BOOL arm_handle_request(rdpArm* arm, BOOL* retry, DWORD timeout) BOOL rc = FALSE; HttpResponse* response = NULL; - long StatusCode; + long StatusCode = 0; if (!http_context_set_uri(arm->http, "/api/arm/v2/connections/") || !http_context_set_accept(arm->http, "application/json") || diff --git a/libfreerdp/core/gateway/http.c b/libfreerdp/core/gateway/http.c index 508f328e2..ed856fcf9 100644 --- a/libfreerdp/core/gateway/http.c +++ b/libfreerdp/core/gateway/http.c @@ -100,9 +100,9 @@ struct s_http_response static char* string_strnstr(char* str1, const char* str2, size_t slen) { - char c; - char sc; - size_t len; + char c = 0; + char sc = 0; + size_t len = 0; if ((c = *str2++) != '\0') { @@ -555,10 +555,10 @@ BOOL http_request_set_transfer_encoding(HttpRequest* request, TRANSFER_ENCODING WINPR_ATTR_FORMAT_ARG(2, 3) static BOOL http_encode_print(wStream* s, WINPR_FORMAT_ARG const char* fmt, ...) { - char* str; + char* str = NULL; va_list ap; - int length; - int used; + int length = 0; + int used = 0; if (!s || !fmt) return FALSE; @@ -657,7 +657,7 @@ unlock: wStream* http_request_write(HttpContext* context, HttpRequest* request) { - wStream* s; + wStream* s = NULL; if (!context || !request) return NULL; @@ -790,8 +790,8 @@ static BOOL http_response_parse_header_status_line(HttpResponse* response, const { BOOL rc = FALSE; char* separator = NULL; - char* status_code; - char* reason_phrase; + char* status_code = NULL; + char* reason_phrase = NULL; if (!response) goto fail; @@ -843,7 +843,7 @@ static BOOL http_response_parse_header_field(HttpResponse* response, const char* if (_stricmp(name, "Content-Length") == 0) { - unsigned long long val; + unsigned long long val = 0; errno = 0; val = _strtoui64(value, NULL, 0); @@ -970,14 +970,14 @@ static BOOL http_response_parse_header_field(HttpResponse* response, const char* static BOOL http_response_parse_header(HttpResponse* response) { BOOL rc = FALSE; - char c; - size_t count; - char* line; - char* name; - char* value; - char* colon_pos; - char* end_of_header; - char end_of_header_char; + char c = 0; + size_t count = 0; + char* line = NULL; + char* name = NULL; + char* value = NULL; + char* colon_pos = NULL; + char* end_of_header = NULL; + char end_of_header_char = 0; if (!response) goto fail; @@ -1118,7 +1118,7 @@ static int print_bio_error(const char* str, size_t len, void* bp) int http_chuncked_read(BIO* bio, BYTE* pBuffer, size_t size, http_encoding_chunked_context* encodingContext) { - int status; + int status = 0; int effectiveDataLen = 0; WINPR_ASSERT(bio); WINPR_ASSERT(pBuffer); @@ -1223,7 +1223,7 @@ int http_chuncked_read(BIO* bio, BYTE* pBuffer, size_t size, HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength) { - size_t position; + size_t position = 0; size_t bodyLength = 0; size_t payloadOffset = 0; HttpResponse* response = http_response_new(); @@ -1235,8 +1235,8 @@ HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength) while (payloadOffset == 0) { - size_t s; - char* end; + size_t s = 0; + char* end = NULL; /* Read until we encounter \r\n\r\n */ ERR_clear_error(); int status = BIO_read(tls->bio, Stream_Pointer(response->data), 1); @@ -1391,7 +1391,7 @@ HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength) { while (response->BodyLength < bodyLength) { - int status; + int status = 0; if (!Stream_EnsureRemainingCapacity(response->data, bodyLength - response->BodyLength)) diff --git a/libfreerdp/core/gateway/ncacn_http.c b/libfreerdp/core/gateway/ncacn_http.c index c81691d22..cbec27a91 100644 --- a/libfreerdp/core/gateway/ncacn_http.c +++ b/libfreerdp/core/gateway/ncacn_http.c @@ -39,7 +39,7 @@ static wStream* rpc_auth_http_request(HttpContext* http, const char* method, int wStream* s = NULL; HttpRequest* request = NULL; char* base64AuthToken = NULL; - const char* uri; + const char* uri = NULL; if (!http || !method) goto fail; @@ -75,13 +75,13 @@ fail: BOOL rpc_ncacn_http_send_in_channel_request(RpcChannel* inChannel) { - wStream* s; - SSIZE_T status; - int contentLength; - rdpCredsspAuth* auth; - HttpContext* http; - const SecBuffer* buffer; - int rc; + wStream* s = NULL; + SSIZE_T status = 0; + int contentLength = 0; + rdpCredsspAuth* auth = NULL; + HttpContext* http = NULL; + const SecBuffer* buffer = NULL; + int rc = 0; if (!inChannel || !inChannel->auth || !inChannel->http) return FALSE; @@ -111,7 +111,7 @@ BOOL rpc_ncacn_http_recv_in_channel_response(RpcChannel* inChannel, HttpResponse const char* token64 = NULL; size_t authTokenLength = 0; BYTE* authTokenData = NULL; - rdpCredsspAuth* auth; + rdpCredsspAuth* auth = NULL; SecBuffer buffer = { 0 }; if (!inChannel || !response || !inChannel->auth) @@ -138,11 +138,11 @@ BOOL rpc_ncacn_http_recv_in_channel_response(RpcChannel* inChannel, HttpResponse BOOL rpc_ncacn_http_auth_init(rdpContext* context, RpcChannel* channel) { - rdpTls* tls; - rdpCredsspAuth* auth; - rdpSettings* settings; - freerdp* instance; - auth_status rc; + rdpTls* tls = NULL; + rdpCredsspAuth* auth = NULL; + rdpSettings* settings = NULL; + freerdp* instance = NULL; + auth_status rc = AUTH_FAILED; SEC_WINNT_AUTH_IDENTITY identity = { 0 }; if (!context || !channel) @@ -203,12 +203,12 @@ void rpc_ncacn_http_auth_uninit(RpcChannel* channel) BOOL rpc_ncacn_http_send_out_channel_request(RpcChannel* outChannel, BOOL replacement) { BOOL status = TRUE; - wStream* s; - int contentLength; - rdpCredsspAuth* auth; - HttpContext* http; - const SecBuffer* buffer; - int rc; + wStream* s = NULL; + int contentLength = 0; + rdpCredsspAuth* auth = NULL; + HttpContext* http = NULL; + const SecBuffer* buffer = NULL; + int rc = 0; if (!outChannel || !outChannel->auth || !outChannel->http) return FALSE; @@ -244,7 +244,7 @@ BOOL rpc_ncacn_http_recv_out_channel_response(RpcChannel* outChannel, HttpRespon const char* token64 = NULL; size_t authTokenLength = 0; BYTE* authTokenData = NULL; - rdpCredsspAuth* auth; + rdpCredsspAuth* auth = NULL; SecBuffer buffer = { 0 }; if (!outChannel || !response || !outChannel->auth) diff --git a/libfreerdp/core/gateway/rdg.c b/libfreerdp/core/gateway/rdg.c index 73686dfc5..ea3da6aa9 100644 --- a/libfreerdp/core/gateway/rdg.c +++ b/libfreerdp/core/gateway/rdg.c @@ -264,7 +264,7 @@ static const char* capabilities_enum_to_string(UINT32 capabilities) static BOOL rdg_read_http_unicode_string(wStream* s, const WCHAR** string, UINT16* lengthInBytes) { - UINT16 strLenBytes; + UINT16 strLenBytes = 0; size_t rem = Stream_GetRemainingLength(s); /* Read length of the string */ @@ -297,9 +297,9 @@ static BOOL rdg_read_http_unicode_string(wStream* s, const WCHAR** string, UINT1 static BOOL rdg_write_chunked(BIO* bio, wStream* sPacket) { - size_t len; - int status; - wStream* sChunk; + size_t len = 0; + int status = 0; + wStream* sChunk = NULL; char chunkSize[11]; sprintf_s(chunkSize, sizeof(chunkSize), "%" PRIXz "\r\n", Stream_Length(sPacket)); sChunk = Stream_New(NULL, strnlen(chunkSize, sizeof(chunkSize)) + Stream_Length(sPacket) + 2); @@ -391,7 +391,7 @@ static BOOL rdg_read_all(rdpTls* tls, BYTE* buffer, size_t size, static wStream* rdg_receive_packet(rdpRdg* rdg) { const size_t header = sizeof(RdgPacketHeader); - size_t packetLength; + size_t packetLength = 0; wStream* s = Stream_New(NULL, 1024); if (!s) @@ -453,8 +453,8 @@ static BOOL rdg_send_handshake(rdpRdg* rdg) static BOOL rdg_send_extauth_sspi(rdpRdg* rdg) { - wStream* s; - BOOL status; + wStream* s = NULL; + BOOL status = 0; UINT32 packetSize = 8 + 4 + 2; WINPR_ASSERT(rdg); @@ -485,8 +485,8 @@ static BOOL rdg_send_extauth_sspi(rdpRdg* rdg) static BOOL rdg_send_tunnel_request(rdpRdg* rdg) { - wStream* s; - BOOL status; + wStream* s = NULL; + BOOL status = 0; UINT32 packetSize = 16; UINT16 fieldsPresent = 0; WCHAR* PAACookie = NULL; @@ -546,8 +546,8 @@ static BOOL rdg_send_tunnel_request(rdpRdg* rdg) static BOOL rdg_send_tunnel_authorization(rdpRdg* rdg) { - wStream* s; - BOOL status; + wStream* s = NULL; + BOOL status = 0; WINPR_ASSERT(rdg); size_t clientNameLen = 0; WCHAR* clientName = @@ -662,7 +662,7 @@ static wStream* rdg_build_http_request(rdpRdg* rdg, const char* method, { wStream* s = NULL; HttpRequest* request = NULL; - const char* uri; + const char* uri = NULL; if (!rdg || !method) return NULL; @@ -702,13 +702,13 @@ out: static BOOL rdg_recv_auth_token(rdpCredsspAuth* auth, HttpResponse* response) { - size_t len; + size_t len = 0; const char* token64 = NULL; size_t authTokenLength = 0; BYTE* authTokenData = NULL; SecBuffer authToken = { 0 }; - long StatusCode; - int rc; + long StatusCode = 0; + int rc = 0; if (!auth || !response) return FALSE; @@ -769,12 +769,12 @@ static BOOL rdg_skip_seed_payload(rdpTls* tls, SSIZE_T lastResponseLength, static BOOL rdg_process_handshake_response(rdpRdg* rdg, wStream* s) { - UINT32 errorCode; - UINT16 serverVersion; - UINT16 extendedAuth; - BYTE verMajor; - BYTE verMinor; - const char* error; + UINT32 errorCode = 0; + UINT16 serverVersion = 0; + UINT16 extendedAuth = 0; + BYTE verMajor = 0; + BYTE verMinor = 0; + const char* error = NULL; WLog_DBG(TAG, "Handshake response received"); if (rdg->state != RDG_CLIENT_STATE_HANDSHAKE) @@ -824,7 +824,7 @@ static BOOL rdg_process_tunnel_response_optional(rdpRdg* rdg, wStream* s, UINT16 if (fieldsPresent & HTTP_TUNNEL_RESPONSE_FIELD_CAPS) { - UINT32 caps; + UINT32 caps = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) return FALSE; @@ -851,8 +851,8 @@ static BOOL rdg_process_tunnel_response_optional(rdpRdg* rdg, wStream* s, UINT16 if (fieldsPresent & HTTP_TUNNEL_RESPONSE_FIELD_CONSENT_MSG) { - const WCHAR* msg; - UINT16 msgLenBytes; + const WCHAR* msg = NULL; + UINT16 msgLenBytes = 0; rdpContext* context = rdg->context; WINPR_ASSERT(context); @@ -874,10 +874,10 @@ static BOOL rdg_process_tunnel_response_optional(rdpRdg* rdg, wStream* s, UINT16 static BOOL rdg_process_tunnel_response(rdpRdg* rdg, wStream* s) { - UINT16 serverVersion; - UINT16 fieldsPresent; - UINT32 errorCode; - const char* error; + UINT16 serverVersion = 0; + UINT16 fieldsPresent = 0; + UINT32 errorCode = 0; + const char* error = NULL; WLog_DBG(TAG, "Tunnel response received"); if (rdg->state != RDG_CLIENT_STATE_TUNNEL_CREATE) @@ -911,9 +911,9 @@ static BOOL rdg_process_tunnel_response(rdpRdg* rdg, wStream* s) static BOOL rdg_process_tunnel_authorization_response(rdpRdg* rdg, wStream* s) { - UINT32 errorCode; - UINT16 fieldsPresent; - const char* error; + UINT32 errorCode = 0; + UINT16 fieldsPresent = 0; + const char* error = NULL; WLog_DBG(TAG, "Tunnel authorization received"); if (rdg->state != RDG_CLIENT_STATE_TUNNEL_AUTHORIZE) @@ -944,8 +944,8 @@ static BOOL rdg_process_tunnel_authorization_response(rdpRdg* rdg, wStream* s) static BOOL rdg_process_extauth_sspi(rdpRdg* rdg, wStream* s) { - UINT32 errorCode; - UINT16 authBlobLen; + UINT32 errorCode = 0; + UINT16 authBlobLen = 0; SecBuffer authToken = { 0 }; BYTE* authTokenData = NULL; @@ -991,9 +991,9 @@ static BOOL rdg_process_extauth_sspi(rdpRdg* rdg, wStream* s) static BOOL rdg_process_channel_response(rdpRdg* rdg, wStream* s) { - UINT16 fieldsPresent; - UINT32 errorCode; - const char* error; + UINT16 fieldsPresent = 0; + UINT32 errorCode = 0; + const char* error = NULL; WLog_DBG(TAG, "Channel response received"); if (rdg->state != RDG_CLIENT_STATE_CHANNEL_CREATE) @@ -1026,8 +1026,8 @@ static BOOL rdg_process_channel_response(rdpRdg* rdg, wStream* s) static BOOL rdg_process_packet(rdpRdg* rdg, wStream* s) { BOOL status = TRUE; - UINT16 type; - UINT32 packetLength; + UINT16 type = 0; + UINT32 packetLength = 0; Stream_SetPosition(s, 0); if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) @@ -1134,7 +1134,7 @@ static BOOL rdg_auth_init(rdpRdg* rdg, rdpTls* tls, TCHAR* authPkg) rdpContext* context = rdg->context; rdpSettings* settings = context->settings; SEC_WINNT_AUTH_IDENTITY identity = { 0 }; - int rc; + int rc = 0; rdg->auth = credssp_auth_new(context); if (!rdg->auth) @@ -1202,7 +1202,7 @@ static BOOL rdg_auth_init(rdpRdg* rdg, rdpTls* tls, TCHAR* authPkg) static BOOL rdg_send_http_request(rdpRdg* rdg, rdpTls* tls, const char* method, TRANSFER_ENCODING transferEncoding) { - size_t sz; + size_t sz = 0; wStream* s = NULL; int status = -1; s = rdg_build_http_request(rdg, method, transferEncoding); @@ -1228,8 +1228,8 @@ static BOOL rdg_tls_connect(rdpRdg* rdg, rdpTls* tls, const char* peerAddress, i rdpSettings* settings = rdg->settings; const char* peerHostname = settings->GatewayHostname; UINT16 peerPort = (UINT16)settings->GatewayPort; - const char* proxyUsername; - const char* proxyPassword; + const char* proxyUsername = NULL; + const char* proxyPassword = NULL; BOOL isProxyConnection = proxy_prepare(settings, &peerHostname, &peerPort, &proxyUsername, &proxyPassword); @@ -1480,8 +1480,8 @@ static BOOL rdg_establish_data_connection(rdpRdg* rdg, rdpTls* tls, const char* static BOOL rdg_tunnel_connect(rdpRdg* rdg) { - BOOL status; - wStream* s; + BOOL status = 0; + wStream* s = NULL; rdg_send_handshake(rdg); while (rdg->state < RDG_CLIENT_STATE_OPENED) @@ -1510,7 +1510,7 @@ static BOOL rdg_tunnel_connect(rdpRdg* rdg) BOOL rdg_connect(rdpRdg* rdg, DWORD timeout, BOOL* rpcFallback) { - BOOL status; + BOOL status = 0; SOCKET outConnSocket = 0; char* peerAddress = NULL; BOOL rpcFallbackLocal = FALSE; @@ -1567,18 +1567,18 @@ BOOL rdg_connect(rdpRdg* rdg, DWORD timeout, BOOL* rpcFallback) static int rdg_write_websocket_data_packet(rdpRdg* rdg, const BYTE* buf, int isize) { - size_t payloadSize; - size_t fullLen; - int status; - wStream* sWS; + size_t payloadSize = 0; + size_t fullLen = 0; + int status = 0; + wStream* sWS = NULL; - uint32_t maskingKey; + uint32_t maskingKey = 0; BYTE* maskingKeyByte1 = (BYTE*)&maskingKey; BYTE* maskingKeyByte2 = maskingKeyByte1 + 1; BYTE* maskingKeyByte3 = maskingKeyByte1 + 2; BYTE* maskingKeyByte4 = maskingKeyByte1 + 3; - int streamPos; + int streamPos = 0; winpr_RAND(&maskingKey, 4); @@ -1654,9 +1654,9 @@ static int rdg_write_websocket_data_packet(rdpRdg* rdg, const BYTE* buf, int isi static int rdg_write_chunked_data_packet(rdpRdg* rdg, const BYTE* buf, int isize) { - int status; - size_t len; - wStream* sChunk; + int status = 0; + size_t len = 0; + wStream* sChunk = NULL; size_t size = (size_t)isize; size_t packetSize = size + 10; char chunkSize[11]; @@ -1713,8 +1713,8 @@ static int rdg_write_data_packet(rdpRdg* rdg, const BYTE* buf, int isize) static BOOL rdg_process_close_packet(rdpRdg* rdg, wStream* s) { int status = -1; - wStream* sClose; - UINT32 errorCode; + wStream* sClose = NULL; + UINT32 errorCode = 0; UINT32 packetSize = 12; /* Read error code */ @@ -1743,7 +1743,7 @@ static BOOL rdg_process_close_packet(rdpRdg* rdg, wStream* s) static BOOL rdg_process_keep_alive_packet(rdpRdg* rdg) { int status = -1; - wStream* sKeepAlive; + wStream* sKeepAlive = NULL; size_t packetSize = 8; sKeepAlive = Stream_New(NULL, packetSize); @@ -1763,8 +1763,8 @@ static BOOL rdg_process_keep_alive_packet(rdpRdg* rdg) static BOOL rdg_process_service_message(rdpRdg* rdg, wStream* s) { - const WCHAR* msg; - UINT16 msgLenBytes; + const WCHAR* msg = NULL; + UINT16 msgLenBytes = 0; rdpContext* context = rdg->context; WINPR_ASSERT(context); WINPR_ASSERT(context->instance); @@ -1792,7 +1792,7 @@ static BOOL rdg_process_control_packet(rdpRdg* rdg, int type, size_t packetLengt { wStream* s = NULL; size_t readCount = 0; - int status; + int status = 0; size_t payloadSize = packetLength - sizeof(RdgPacketHeader); if (packetLength < sizeof(RdgPacketHeader)) @@ -1872,8 +1872,8 @@ static int rdg_read_data_packet(rdpRdg* rdg, BYTE* buffer, int size) { RdgPacketHeader header; size_t readCount = 0; - size_t readSize; - int status; + size_t readSize = 0; + int status = 0; if (!rdg->packetRemainingCount) { @@ -1953,7 +1953,7 @@ static int rdg_read_data_packet(rdpRdg* rdg, BYTE* buffer, int size) static int rdg_bio_write(BIO* bio, const char* buf, int num) { - int status; + int status = 0; rdpRdg* rdg = (rdpRdg*)BIO_get_data(bio); BIO_clear_flags(bio, BIO_FLAGS_WRITE); EnterCriticalSection(&rdg->writeSection); @@ -1980,7 +1980,7 @@ static int rdg_bio_write(BIO* bio, const char* buf, int num) static int rdg_bio_read(BIO* bio, char* buf, int size) { - int status; + int status = 0; rdpRdg* rdg = (rdpRdg*)BIO_get_data(bio); status = rdg_read_data_packet(rdg, (BYTE*)buf, size); @@ -2145,7 +2145,7 @@ static BIO_METHOD* BIO_s_rdg(void) rdpRdg* rdg_new(rdpContext* context) { - rdpRdg* rdg; + rdpRdg* rdg = NULL; if (!context) return NULL; diff --git a/libfreerdp/core/gateway/rpc.c b/libfreerdp/core/gateway/rpc.c index ad4007b30..cf8cc675b 100644 --- a/libfreerdp/core/gateway/rpc.c +++ b/libfreerdp/core/gateway/rpc.c @@ -277,7 +277,7 @@ rpcconn_common_hdr_t rpc_pdu_header_init(const rdpRpc* rpc) size_t rpc_offset_align(size_t* offset, size_t alignment) { - size_t pad; + size_t pad = 0; pad = *offset; *offset = (*offset + alignment - 1) & ~(alignment - 1); pad = *offset - pad; @@ -371,10 +371,10 @@ BOOL rpc_get_stub_data_info(rdpRpc* rpc, const rpcconn_hdr_t* header, size_t* po size_t used = 0; size_t offset = 0; BOOL rc = FALSE; - UINT32 frag_length; - UINT32 auth_length; + UINT32 frag_length = 0; + UINT32 auth_length = 0; UINT32 auth_pad_length = 0; - UINT32 sec_trailer_offset; + UINT32 sec_trailer_offset = 0; const rpc_sec_trailer* sec_trailer = NULL; WINPR_ASSERT(rpc); @@ -451,7 +451,7 @@ fail: SSIZE_T rpc_channel_read(RpcChannel* channel, wStream* s, size_t length) { - int status; + int status = 0; if (!channel || (length > INT32_MAX)) return -1; @@ -474,7 +474,7 @@ SSIZE_T rpc_channel_read(RpcChannel* channel, wStream* s, size_t length) SSIZE_T rpc_channel_write(RpcChannel* channel, const BYTE* data, size_t length) { - int status; + int status = 0; if (!channel || (length > INT32_MAX)) return -1; @@ -496,8 +496,8 @@ BOOL rpc_in_channel_transition_to_state(RpcInChannel* inChannel, CLIENT_IN_CHANN static int rpc_channel_rpch_init(RpcClient* client, RpcChannel* channel, const char* inout, const GUID* guid) { - HttpContext* http; - rdpSettings* settings; + HttpContext* http = NULL; + rdpSettings* settings = NULL; UINT32 timeout = 0; if (!client || !channel || !inout || !client->context || !client->context->settings) @@ -701,15 +701,15 @@ fail: static BOOL rpc_channel_tls_connect(RpcChannel* channel, UINT32 timeout) { - int sockfd; - rdpTls* tls; - int tlsStatus; - BIO* socketBio; - BIO* bufferedBio; - rdpContext* context; - rdpSettings* settings; - const char* proxyUsername; - const char* proxyPassword; + int sockfd = 0; + rdpTls* tls = NULL; + int tlsStatus = 0; + BIO* socketBio = NULL; + BIO* bufferedBio = NULL; + rdpContext* context = NULL; + rdpSettings* settings = NULL; + const char* proxyUsername = NULL; + const char* proxyPassword = NULL; if (!channel || !channel->client || !channel->client->context || !channel->client->context->settings) @@ -791,7 +791,7 @@ static BOOL rpc_channel_tls_connect(RpcChannel* channel, UINT32 timeout) static int rpc_in_channel_connect(RpcInChannel* inChannel, UINT32 timeout) { - rdpContext* context; + rdpContext* context = NULL; if (!inChannel || !inChannel->common.client || !inChannel->common.client->context) return -1; @@ -825,7 +825,7 @@ static int rpc_in_channel_connect(RpcInChannel* inChannel, UINT32 timeout) static int rpc_out_channel_connect(RpcOutChannel* outChannel, int timeout) { - rdpContext* context; + rdpContext* context = NULL; if (!outChannel || !outChannel->common.client || !outChannel->common.client->context) return -1; @@ -857,7 +857,7 @@ static int rpc_out_channel_connect(RpcOutChannel* outChannel, int timeout) int rpc_out_channel_replacement_connect(RpcOutChannel* outChannel, int timeout) { - rdpContext* context; + rdpContext* context = NULL; if (!outChannel || !outChannel->common.client || !outChannel->common.client->context) return -1; @@ -889,9 +889,9 @@ int rpc_out_channel_replacement_connect(RpcOutChannel* outChannel, int timeout) BOOL rpc_connect(rdpRpc* rpc, UINT32 timeout) { - RpcInChannel* inChannel; - RpcOutChannel* outChannel; - RpcVirtualConnection* connection; + RpcInChannel* inChannel = NULL; + RpcOutChannel* outChannel = NULL; + RpcVirtualConnection* connection = NULL; rpc->VirtualConnection = rpc_virtual_connection_new(rpc); if (!rpc->VirtualConnection) @@ -914,7 +914,7 @@ BOOL rpc_connect(rdpRpc* rpc, UINT32 timeout) rdpRpc* rpc_new(rdpTransport* transport) { rdpContext* context = transport_get_context(transport); - rdpRpc* rpc; + rdpRpc* rpc = NULL; WINPR_ASSERT(context); diff --git a/libfreerdp/core/gateway/rpc_bind.c b/libfreerdp/core/gateway/rpc_bind.c index 2071fd604..f52c53c32 100644 --- a/libfreerdp/core/gateway/rpc_bind.c +++ b/libfreerdp/core/gateway/rpc_bind.c @@ -111,9 +111,9 @@ const p_uuid_t BTFN_UUID = { static int rpc_bind_setup(rdpRpc* rpc) { int rc = -1; - rdpContext* context; - rdpSettings* settings; - freerdp* instance; + rdpContext* context = NULL; + rdpSettings* settings = NULL; + freerdp* instance = NULL; SEC_WINNT_AUTH_IDENTITY identity = { 0 }; WINPR_ASSERT(rpc); @@ -177,12 +177,12 @@ int rpc_send_bind_pdu(rdpRpc* rpc, BOOL initial) { int status = -1; wStream* buffer = NULL; - UINT32 offset; - RpcClientCall* clientCall; - p_cont_elem_t* p_cont_elem; + UINT32 offset = 0; + RpcClientCall* clientCall = NULL; + p_cont_elem_t* p_cont_elem = NULL; rpcconn_bind_hdr_t bind_pdu = { 0 }; - RpcVirtualConnection* connection; - RpcInChannel* inChannel; + RpcVirtualConnection* connection = NULL; + RpcInChannel* inChannel = NULL; const SecBuffer* sbuffer = NULL; WINPR_ASSERT(rpc); @@ -323,9 +323,9 @@ fail: BOOL rpc_recv_bind_ack_pdu(rdpRpc* rpc, wStream* s) { BOOL rc = FALSE; - const BYTE* auth_data; - size_t pos; - size_t end; + const BYTE* auth_data = NULL; + size_t pos = 0; + size_t end = 0; rpcconn_hdr_t header = { 0 }; SecBuffer buffer = { 0 }; @@ -376,13 +376,13 @@ fail: int rpc_send_rpc_auth_3_pdu(rdpRpc* rpc) { int status = -1; - wStream* buffer; - size_t offset; - const SecBuffer* sbuffer; - RpcClientCall* clientCall; + wStream* buffer = NULL; + size_t offset = 0; + const SecBuffer* sbuffer = NULL; + RpcClientCall* clientCall = NULL; rpcconn_rpc_auth_3_hdr_t auth_3_pdu = { 0 }; - RpcVirtualConnection* connection; - RpcInChannel* inChannel; + RpcVirtualConnection* connection = NULL; + RpcInChannel* inChannel = NULL; WINPR_ASSERT(rpc); @@ -440,8 +440,8 @@ fail: enum RPC_BIND_STATE rpc_bind_state(rdpRpc* rpc) { - BOOL complete; - BOOL have_token; + BOOL complete = 0; + BOOL have_token = 0; WINPR_ASSERT(rpc); complete = credssp_auth_is_complete(rpc->auth); diff --git a/libfreerdp/core/gateway/rpc_client.c b/libfreerdp/core/gateway/rpc_client.c index 319043fde..4c3b30790 100644 --- a/libfreerdp/core/gateway/rpc_client.c +++ b/libfreerdp/core/gateway/rpc_client.c @@ -95,7 +95,7 @@ static void rpc_pdu_reset(RPC_PDU* pdu) static RPC_PDU* rpc_pdu_new(void) { - RPC_PDU* pdu; + RPC_PDU* pdu = NULL; pdu = (RPC_PDU*)malloc(sizeof(RPC_PDU)); if (!pdu) @@ -358,10 +358,10 @@ static int rpc_client_recv_pdu(rdpRpc* rpc, RPC_PDU* pdu) static int rpc_client_recv_fragment(rdpRpc* rpc, wStream* fragment) { int rc = -1; - RPC_PDU* pdu; - size_t StubOffset; - size_t StubLength; - RpcClientCall* call; + RPC_PDU* pdu = NULL; + size_t StubOffset = 0; + size_t StubLength = 0; + RpcClientCall* call = NULL; rpcconn_hdr_t header = { 0 }; WINPR_ASSERT(rpc); @@ -561,10 +561,10 @@ fail: static SSIZE_T rpc_client_default_out_channel_recv(rdpRpc* rpc) { SSIZE_T status = -1; - UINT32 statusCode; - HttpResponse* response; - RpcInChannel* inChannel; - RpcOutChannel* outChannel; + UINT32 statusCode = 0; + HttpResponse* response = NULL; + RpcInChannel* inChannel = NULL; + RpcOutChannel* outChannel = NULL; HANDLE outChannelEvent = NULL; RpcVirtualConnection* connection = rpc->VirtualConnection; inChannel = connection->DefaultInChannel; @@ -667,7 +667,7 @@ static SSIZE_T rpc_client_default_out_channel_recv(rdpRpc* rpc) while (1) { - size_t pos; + size_t pos = 0; rpcconn_common_hdr_t header = { 0 }; while (Stream_GetPosition(fragment) < RPC_COMMON_FIELDS_LENGTH) @@ -746,8 +746,8 @@ static SSIZE_T rpc_client_default_out_channel_recv(rdpRpc* rpc) static SSIZE_T rpc_client_nondefault_out_channel_recv(rdpRpc* rpc) { SSIZE_T status = -1; - HttpResponse* response; - RpcOutChannel* nextOutChannel; + HttpResponse* response = NULL; + RpcOutChannel* nextOutChannel = NULL; HANDLE nextOutChannelEvent = NULL; nextOutChannel = rpc->VirtualConnection->NonDefaultOutChannel; BIO_get_event(nextOutChannel->common.tls->bio, &nextOutChannelEvent); @@ -816,7 +816,7 @@ static SSIZE_T rpc_client_nondefault_out_channel_recv(rdpRpc* rpc) int rpc_client_out_channel_recv(rdpRpc* rpc) { - SSIZE_T status; + SSIZE_T status = 0; RpcVirtualConnection* connection = rpc->VirtualConnection; if (connection->DefaultOutChannel) @@ -841,9 +841,9 @@ int rpc_client_out_channel_recv(rdpRpc* rpc) int rpc_client_in_channel_recv(rdpRpc* rpc) { int status = 1; - HttpResponse* response; - RpcInChannel* inChannel; - RpcOutChannel* outChannel; + HttpResponse* response = NULL; + RpcInChannel* inChannel = NULL; + RpcOutChannel* outChannel = NULL; HANDLE InChannelEvent = NULL; RpcVirtualConnection* connection = rpc->VirtualConnection; inChannel = connection->DefaultInChannel; @@ -927,8 +927,8 @@ int rpc_client_in_channel_recv(rdpRpc* rpc) RpcClientCall* rpc_client_call_find_by_id(RpcClient* client, UINT32 CallId) { - size_t index; - size_t count; + size_t index = 0; + size_t count = 0; RpcClientCall* clientCall = NULL; if (!client) @@ -951,7 +951,7 @@ RpcClientCall* rpc_client_call_find_by_id(RpcClient* client, UINT32 CallId) RpcClientCall* rpc_client_call_new(UINT32 CallId, UINT32 OpNum) { - RpcClientCall* clientCall; + RpcClientCall* clientCall = NULL; clientCall = (RpcClientCall*)calloc(1, sizeof(RpcClientCall)); if (!clientCall) @@ -975,8 +975,8 @@ static void rpc_array_client_call_free(void* call) int rpc_in_channel_send_pdu(RpcInChannel* inChannel, const BYTE* buffer, size_t length) { - SSIZE_T status; - RpcClientCall* clientCall; + SSIZE_T status = 0; + RpcClientCall* clientCall = NULL; wStream s; rpcconn_common_hdr_t header = { 0 }; @@ -1010,18 +1010,18 @@ int rpc_in_channel_send_pdu(RpcInChannel* inChannel, const BYTE* buffer, size_t BOOL rpc_client_write_call(rdpRpc* rpc, wStream* s, UINT16 opnum) { - size_t offset; + size_t offset = 0; BYTE* buffer = NULL; - UINT32 stub_data_pad; + UINT32 stub_data_pad = 0; SecBuffer plaintext; SecBuffer ciphertext = { 0 }; RpcClientCall* clientCall = NULL; - rdpCredsspAuth* auth; + rdpCredsspAuth* auth = NULL; rpcconn_request_hdr_t request_pdu = { 0 }; - RpcVirtualConnection* connection; - RpcInChannel* inChannel; - size_t length; - size_t size; + RpcVirtualConnection* connection = NULL; + RpcInChannel* inChannel = NULL; + size_t length = 0; + size_t size = 0; BOOL rc = FALSE; if (!s) @@ -1124,7 +1124,7 @@ fail: static BOOL rpc_client_resolve_gateway(rdpSettings* settings, char** host, UINT16* port, BOOL* isProxy) { - struct addrinfo* result; + struct addrinfo* result = NULL; if (!settings || !host || !port || !isProxy) return FALSE; @@ -1149,7 +1149,7 @@ static BOOL rpc_client_resolve_gateway(rdpSettings* settings, char** host, UINT1 RpcClient* rpc_client_new(rdpContext* context, UINT32 max_recv_frag) { - wObject* obj; + wObject* obj = NULL; RpcClient* client = (RpcClient*)calloc(1, sizeof(RpcClient)); if (!client) diff --git a/libfreerdp/core/gateway/rpc_fault.c b/libfreerdp/core/gateway/rpc_fault.c index ca61f491d..8f51854e1 100644 --- a/libfreerdp/core/gateway/rpc_fault.c +++ b/libfreerdp/core/gateway/rpc_fault.c @@ -354,7 +354,7 @@ static UINT32 rpc_map_status_code_to_win32_error_code(UINT32 code) const char* rpc_error_to_string(UINT32 code) { - size_t index; + size_t index = 0; static char buffer[1024]; for (index = 0; index < ARRAYSIZE(RPC_FAULT_CODES); index++) @@ -394,7 +394,7 @@ out: const char* rpc_error_to_category(UINT32 code) { - size_t index; + size_t index = 0; for (index = 0; index < ARRAYSIZE(RPC_FAULT_CODES); index++) { diff --git a/libfreerdp/core/gateway/rts.c b/libfreerdp/core/gateway/rts.c index 634bc0d36..5a13a39d0 100644 --- a/libfreerdp/core/gateway/rts.c +++ b/libfreerdp/core/gateway/rts.c @@ -177,8 +177,8 @@ static rpcconn_rts_hdr_t rts_pdu_header_init(void) static BOOL rts_align_stream(wStream* s, size_t alignment, BOOL silent) { - size_t pos; - size_t pad; + size_t pos = 0; + size_t pad = 0; WINPR_ASSERT(s); WINPR_ASSERT(alignment > 0); @@ -190,7 +190,7 @@ static BOOL rts_align_stream(wStream* s, size_t alignment, BOOL silent) static char* sdup(const void* src, size_t length) { - char* dst; + char* dst = NULL; WINPR_ASSERT(src || (length == 0)); if (length == 0) return NULL; @@ -313,7 +313,7 @@ static BOOL rts_read_auth_verifier_no_checks(wStream* s, auth_verifier_co_t* aut static BOOL rts_read_auth_verifier(wStream* s, auth_verifier_co_t* auth, const rpcconn_common_hdr_t* header, BOOL silent) { - size_t pos; + size_t pos = 0; WINPR_ASSERT(s); WINPR_ASSERT(auth); WINPR_ASSERT(header); @@ -332,7 +332,7 @@ static BOOL rts_read_auth_verifier(wStream* s, auth_verifier_co_t* auth, static BOOL rts_read_auth_verifier_with_stub(wStream* s, auth_verifier_co_t* auth, rpcconn_common_hdr_t* header, BOOL silent) { - size_t pos; + size_t pos = 0; size_t alloc_hint = 0; BYTE** ptr = NULL; @@ -395,7 +395,7 @@ static void rts_free_auth_verifier(auth_verifier_co_t* auth) static BOOL rts_write_auth_verifier(wStream* s, const auth_verifier_co_t* auth, const rpcconn_common_hdr_t* header) { - size_t pos; + size_t pos = 0; UINT8 auth_pad_length = 0; WINPR_ASSERT(s); @@ -460,7 +460,7 @@ static void rts_free_supported_versions(p_rt_versions_supported_t* versions) static BOOL rts_read_supported_versions(wStream* s, p_rt_versions_supported_t* versions, BOOL silent) { - BYTE x; + BYTE x = 0; WINPR_ASSERT(s); WINPR_ASSERT(versions); @@ -605,7 +605,7 @@ static void rts_context_elem_free(p_cont_elem_t* ptr) static BOOL rts_read_context_elem(wStream* s, p_cont_elem_t* element, BOOL silent) { - BYTE x; + BYTE x = 0; WINPR_ASSERT(s); WINPR_ASSERT(element); @@ -637,7 +637,7 @@ static BOOL rts_read_context_elem(wStream* s, p_cont_elem_t* element, BOOL silen static BOOL rts_write_context_elem(wStream* s, const p_cont_elem_t* element) { - BYTE x; + BYTE x = 0; WINPR_ASSERT(s); WINPR_ASSERT(element); @@ -661,7 +661,7 @@ static BOOL rts_write_context_elem(wStream* s, const p_cont_elem_t* element) static BOOL rts_read_context_list(wStream* s, p_cont_list_t* list, BOOL silent) { - BYTE x; + BYTE x = 0; WINPR_ASSERT(s); WINPR_ASSERT(list); @@ -696,7 +696,7 @@ static void rts_free_context_list(p_cont_list_t* list) static BOOL rts_write_context_list(wStream* s, const p_cont_list_t* list) { - BYTE x; + BYTE x = 0; WINPR_ASSERT(s); WINPR_ASSERT(list); @@ -749,7 +749,7 @@ static void rts_free_result(p_result_t* result) static BOOL rts_read_result_list(wStream* s, p_result_list_t* list, BOOL silent) { - BYTE x; + BYTE x = 0; WINPR_ASSERT(s); WINPR_ASSERT(list); @@ -779,7 +779,7 @@ static BOOL rts_read_result_list(wStream* s, p_result_list_t* list, BOOL silent) static void rts_free_result_list(p_result_list_t* list) { - BYTE x; + BYTE x = 0; if (!list) return; @@ -1251,7 +1251,7 @@ static BOOL rts_write_pdu_header(wStream* s, const rpcconn_rts_hdr_t* header) static BOOL rts_receive_window_size_command_read(rdpRpc* rpc, wStream* buffer, UINT64* ReceiveWindowSize) { - UINT32 val; + UINT32 val = 0; WINPR_ASSERT(rpc); WINPR_ASSERT(buffer); @@ -1339,7 +1339,7 @@ static BOOL rts_flow_control_ack_command_write(wStream* s, UINT32 BytesReceived, static BOOL rts_connection_timeout_command_read(rdpRpc* rpc, wStream* buffer, UINT64* ConnectionTimeout) { - UINT32 val; + UINT32 val = 0; WINPR_ASSERT(rpc); WINPR_ASSERT(buffer); @@ -1436,7 +1436,7 @@ static BOOL rts_empty_command_write(wStream* s) static BOOL rts_padding_command_read(wStream* s, size_t* length, BOOL silent) { - UINT32 ConformanceCount; + UINT32 ConformanceCount = 0; WINPR_ASSERT(s); WINPR_ASSERT(length); if (!Stream_ConditionalCheckAndLogRequiredLength(TAG, s, 4, silent)) @@ -1448,7 +1448,7 @@ static BOOL rts_padding_command_read(wStream* s, size_t* length, BOOL silent) static BOOL rts_client_address_command_read(wStream* s, size_t* length, BOOL silent) { - UINT32 AddressType; + UINT32 AddressType = 0; WINPR_ASSERT(s); WINPR_ASSERT(length); @@ -1487,7 +1487,7 @@ static BOOL rts_association_group_id_command_write(wStream* s, const BYTE* Assoc static int rts_destination_command_read(rdpRpc* rpc, wStream* buffer, UINT32* Destination) { - UINT32 val; + UINT32 val = 0; WINPR_ASSERT(rpc); WINPR_ASSERT(buffer); @@ -1522,7 +1522,7 @@ void rts_generate_cookie(BYTE* cookie) static BOOL rts_send_buffer(RpcChannel* channel, wStream* s, size_t frag_length) { BOOL status = FALSE; - SSIZE_T rc; + SSIZE_T rc = 0; WINPR_ASSERT(channel); WINPR_ASSERT(s); @@ -1548,13 +1548,13 @@ fail: BOOL rts_send_CONN_A1_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer; + wStream* buffer = NULL; rpcconn_rts_hdr_t header = rts_pdu_header_init(); - UINT32 ReceiveWindowSize; - BYTE* OUTChannelCookie; - BYTE* VirtualConnectionCookie; - RpcVirtualConnection* connection; - RpcOutChannel* outChannel; + UINT32 ReceiveWindowSize = 0; + BYTE* OUTChannelCookie = NULL; + BYTE* VirtualConnectionCookie = NULL; + RpcVirtualConnection* connection = NULL; + RpcOutChannel* outChannel = NULL; WINPR_ASSERT(rpc); @@ -1602,8 +1602,8 @@ fail: BOOL rts_recv_CONN_A3_pdu(rdpRpc* rpc, wStream* buffer) { - BOOL rc; - UINT64 ConnectionTimeout; + BOOL rc = 0; + UINT64 ConnectionTimeout = 0; if (!Stream_SafeSeek(buffer, 20)) return FALSE; @@ -1627,13 +1627,13 @@ BOOL rts_recv_CONN_A3_pdu(rdpRpc* rpc, wStream* buffer) BOOL rts_send_CONN_B1_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer; + wStream* buffer = NULL; rpcconn_rts_hdr_t header = rts_pdu_header_init(); - BYTE* INChannelCookie; - BYTE* AssociationGroupId; - BYTE* VirtualConnectionCookie; - RpcVirtualConnection* connection; - RpcInChannel* inChannel; + BYTE* INChannelCookie = NULL; + BYTE* AssociationGroupId = NULL; + BYTE* VirtualConnectionCookie = NULL; + RpcVirtualConnection* connection = NULL; + RpcInChannel* inChannel = NULL; WINPR_ASSERT(rpc); @@ -1722,14 +1722,14 @@ BOOL rts_recv_CONN_C2_pdu(rdpRpc* rpc, wStream* buffer) BOOL rts_send_flow_control_ack_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer; + wStream* buffer = NULL; rpcconn_rts_hdr_t header = rts_pdu_header_init(); - UINT32 BytesReceived; - UINT32 AvailableWindow; - BYTE* ChannelCookie; - RpcVirtualConnection* connection; - RpcInChannel* inChannel; - RpcOutChannel* outChannel; + UINT32 BytesReceived = 0; + UINT32 AvailableWindow = 0; + BYTE* ChannelCookie = NULL; + RpcVirtualConnection* connection = NULL; + RpcInChannel* inChannel = NULL; + RpcOutChannel* outChannel = NULL; WINPR_ASSERT(rpc); @@ -1774,9 +1774,9 @@ fail: static int rts_recv_flow_control_ack_pdu(rdpRpc* rpc, wStream* buffer) { - int rc; - UINT32 BytesReceived; - UINT32 AvailableWindow; + int rc = 0; + UINT32 BytesReceived = 0; + UINT32 AvailableWindow = 0; BYTE ChannelCookie[16] = { 0 }; rc = rts_flow_control_ack_command_read(rpc, buffer, &BytesReceived, &AvailableWindow, @@ -1906,9 +1906,9 @@ fail: static int rts_send_ping_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer; + wStream* buffer = NULL; rpcconn_rts_hdr_t header = rts_pdu_header_init(); - RpcInChannel* inChannel; + RpcInChannel* inChannel = NULL; WINPR_ASSERT(rpc); WINPR_ASSERT(rpc->VirtualConnection); @@ -2022,11 +2022,11 @@ BOOL rts_command_length(UINT32 CommandType, wStream* s, size_t* length, BOOL sil static int rts_send_OUT_R2_A7_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer; + wStream* buffer = NULL; rpcconn_rts_hdr_t header = rts_pdu_header_init(); - BYTE* SuccessorChannelCookie; - RpcInChannel* inChannel; - RpcOutChannel* nextOutChannel; + BYTE* SuccessorChannelCookie = NULL; + RpcInChannel* inChannel = NULL; + RpcOutChannel* nextOutChannel = NULL; WINPR_ASSERT(rpc); WINPR_ASSERT(rpc->VirtualConnection); @@ -2067,9 +2067,9 @@ fail: static int rts_send_OUT_R2_C1_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer; + wStream* buffer = NULL; rpcconn_rts_hdr_t header = rts_pdu_header_init(); - RpcOutChannel* nextOutChannel; + RpcOutChannel* nextOutChannel = NULL; WINPR_ASSERT(rpc); WINPR_ASSERT(rpc->VirtualConnection); @@ -2101,15 +2101,15 @@ fail: BOOL rts_send_OUT_R1_A3_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer; + wStream* buffer = NULL; rpcconn_rts_hdr_t header = rts_pdu_header_init(); - UINT32 ReceiveWindowSize; - BYTE* VirtualConnectionCookie; - BYTE* PredecessorChannelCookie; - BYTE* SuccessorChannelCookie; - RpcVirtualConnection* connection; - RpcOutChannel* outChannel; - RpcOutChannel* nextOutChannel; + UINT32 ReceiveWindowSize = 0; + BYTE* VirtualConnectionCookie = NULL; + BYTE* PredecessorChannelCookie = NULL; + BYTE* SuccessorChannelCookie = NULL; + RpcVirtualConnection* connection = NULL; + RpcOutChannel* outChannel = NULL; + RpcOutChannel* nextOutChannel = NULL; WINPR_ASSERT(rpc); @@ -2162,9 +2162,9 @@ fail: static int rts_recv_OUT_R1_A2_pdu(rdpRpc* rpc, wStream* buffer) { - int status; + int status = 0; UINT32 Destination = 0; - RpcVirtualConnection* connection; + RpcVirtualConnection* connection = NULL; WINPR_ASSERT(rpc); WINPR_ASSERT(buffer); @@ -2197,8 +2197,8 @@ static int rts_recv_OUT_R1_A2_pdu(rdpRpc* rpc, wStream* buffer) static int rts_recv_OUT_R2_A6_pdu(rdpRpc* rpc, wStream* buffer) { - int status; - RpcVirtualConnection* connection; + int status = 0; + RpcVirtualConnection* connection = NULL; WINPR_ASSERT(rpc); WINPR_ASSERT(buffer); @@ -2232,7 +2232,7 @@ static int rts_recv_OUT_R2_A6_pdu(rdpRpc* rpc, wStream* buffer) static int rts_recv_OUT_R2_B3_pdu(rdpRpc* rpc, wStream* buffer) { - RpcVirtualConnection* connection; + RpcVirtualConnection* connection = NULL; WINPR_ASSERT(rpc); WINPR_ASSERT(buffer); @@ -2249,9 +2249,9 @@ static int rts_recv_OUT_R2_B3_pdu(rdpRpc* rpc, wStream* buffer) BOOL rts_recv_out_of_sequence_pdu(rdpRpc* rpc, wStream* buffer, const rpcconn_hdr_t* header) { BOOL status = FALSE; - size_t length; + size_t length = 0; RtsPduSignature signature = { 0 }; - RpcVirtualConnection* connection; + RpcVirtualConnection* connection = NULL; WINPR_ASSERT(rpc); WINPR_ASSERT(buffer); diff --git a/libfreerdp/core/gateway/rts_signature.c b/libfreerdp/core/gateway/rts_signature.c index 9fbc9e608..2a1e15a16 100644 --- a/libfreerdp/core/gateway/rts_signature.c +++ b/libfreerdp/core/gateway/rts_signature.c @@ -315,10 +315,10 @@ BOOL rts_extract_pdu_signature_ex(RtsPduSignature* signature, wStream* src, const rpcconn_hdr_t* header, BOOL silent) { BOOL rc = FALSE; - UINT16 i; + UINT16 i = 0; wStream sbuffer = { 0 }; rpcconn_hdr_t rheader = { 0 }; - const rpcconn_rts_hdr_t* rts; + const rpcconn_rts_hdr_t* rts = NULL; WINPR_ASSERT(signature); WINPR_ASSERT(src); @@ -339,8 +339,8 @@ BOOL rts_extract_pdu_signature_ex(RtsPduSignature* signature, wStream* src, for (i = 0; i < rts->NumberOfCommands; i++) { - UINT32 CommandType; - size_t CommandLength; + UINT32 CommandType = 0; + size_t CommandLength = 0; if (!Stream_ConditionalCheckAndLogRequiredLength(TAG, s, 4, silent)) goto fail; @@ -366,8 +366,8 @@ fail: UINT32 rts_identify_pdu_signature(const RtsPduSignature* signature, const RTS_PDU_SIGNATURE_ENTRY** entry) { - size_t i; - size_t j; + size_t i = 0; + size_t j = 0; if (entry) *entry = NULL; @@ -403,8 +403,8 @@ UINT32 rts_identify_pdu_signature(const RtsPduSignature* signature, BOOL rts_print_pdu_signature(wLog* log, DWORD level, const RtsPduSignature* signature) { - UINT32 SignatureId; - const RTS_PDU_SIGNATURE_ENTRY* entry; + UINT32 SignatureId = 0; + const RTS_PDU_SIGNATURE_ENTRY* entry = NULL; if (!signature) return FALSE; diff --git a/libfreerdp/core/gateway/tsg.c b/libfreerdp/core/gateway/tsg.c index e2a33423e..22f04659d 100644 --- a/libfreerdp/core/gateway/tsg.c +++ b/libfreerdp/core/gateway/tsg.c @@ -759,7 +759,7 @@ static BOOL tsg_ndr_read_packet_response(wLog* log, wStream* s, UINT32* index, WINPR_ATTR_FORMAT_ARG(3, 4) static BOOL tsg_print(char** buffer, size_t* len, WINPR_FORMAT_ARG const char* fmt, ...) { - int rc; + int rc = 0; va_list ap; if (!buffer || !len || !fmt) return FALSE; @@ -799,7 +799,7 @@ static BOOL tsg_type_capability_nap_to_string(char** buffer, size_t* length, static BOOL tsg_packet_capabilities_to_string(char** buffer, size_t* length, const TSG_PACKET_CAPABILITIES* caps, UINT32 numCaps) { - UINT32 x; + UINT32 x = 0; WINPR_ASSERT(buffer); WINPR_ASSERT(length); @@ -977,7 +977,7 @@ static BOOL tsg_packet_quarenc_response_to_string(char** buffer, size_t* length, { BOOL rc = FALSE; char* strdata = NULL; - RPC_CSTR uuid; + RPC_CSTR uuid = NULL; char tbuffer[8192] = { 0 }; size_t size = ARRAYSIZE(tbuffer); char* ptbuffer = tbuffer; @@ -1207,7 +1207,7 @@ fail: static BOOL tsg_stream_align(wLog* log, wStream* s, size_t align) { - size_t pos; + size_t pos = 0; size_t offset = 0; if (!s) @@ -1264,15 +1264,15 @@ static BIO_METHOD* BIO_s_tsg(void); static int TsProxySendToServer(handle_t IDL_handle, const byte pRpcMessage[], UINT32 count, UINT32* lengths) { - wStream* s; - rdpTsg* tsg; - size_t length; + wStream* s = NULL; + rdpTsg* tsg = NULL; + size_t length = 0; const byte* buffer1 = NULL; const byte* buffer2 = NULL; const byte* buffer3 = NULL; - UINT32 buffer1Length; - UINT32 buffer2Length; - UINT32 buffer3Length; + UINT32 buffer1Length = 0; + UINT32 buffer2Length = 0; + UINT32 buffer3Length = 0; UINT32 numBuffers = 0; UINT32 totalDataBytes = 0; tsg = (rdpTsg*)IDL_handle; @@ -1362,8 +1362,8 @@ static BOOL TsProxyCreateTunnelWriteRequest(rdpTsg* tsg, const TSG_PACKET* tsgPa BOOL rc = FALSE; BOOL write = TRUE; UINT16 opnum = 0; - wStream* s; - rdpRpc* rpc; + wStream* s = NULL; + rdpRpc* rpc = NULL; if (!tsg || !tsg->rpc) return FALSE; @@ -1598,8 +1598,8 @@ static BOOL TsProxyCreateTunnelReadResponse(rdpTsg* tsg, RPC_PDU* pdu, BOOL rc = FALSE; UINT32 index = 0; TSG_PACKET packet = { 0 }; - UINT32 SwitchValue; - rdpContext* context; + UINT32 SwitchValue = 0; + rdpContext* context = NULL; UINT32 PacketPtr = 0; WINPR_ASSERT(tsg); @@ -1676,11 +1676,11 @@ fail: static BOOL TsProxyAuthorizeTunnelWriteRequest(rdpTsg* tsg, CONTEXT_HANDLE* tunnelContext) { - size_t pad; - wStream* s; - size_t count; - size_t offset; - rdpRpc* rpc; + size_t pad = 0; + wStream* s = NULL; + size_t count = 0; + size_t offset = 0; + rdpRpc* rpc = NULL; if (!tsg || !tsg->rpc || !tunnelContext || !tsg->MachineName) return FALSE; @@ -1733,7 +1733,7 @@ fail: static BOOL TsProxyAuthorizeTunnelReadResponse(wLog* log, RPC_PDU* pdu) { BOOL rc = FALSE; - UINT32 SwitchValue; + UINT32 SwitchValue = 0; UINT32 index = 0; TSG_PACKET packet = { 0 }; UINT32 PacketPtr = 0; @@ -1793,8 +1793,8 @@ fail: static BOOL TsProxyMakeTunnelCallWriteRequest(rdpTsg* tsg, CONTEXT_HANDLE* tunnelContext, UINT32 procId) { - wStream* s; - rdpRpc* rpc; + wStream* s = NULL; + rdpRpc* rpc = NULL; if (!tsg || !tsg->rpc || !tunnelContext) return FALSE; @@ -1852,9 +1852,9 @@ static BOOL TsProxyMakeTunnelCallReadResponse(rdpTsg* tsg, RPC_PDU* pdu) { BOOL rc = FALSE; UINT32 index = 0; - UINT32 SwitchValue; + UINT32 SwitchValue = 0; TSG_PACKET packet; - rdpContext* context; + rdpContext* context = NULL; char* messageText = NULL; TSG_PACKET_MSG_RESPONSE packetMsgResponse = { 0 }; TSG_PACKET_STRING_MESSAGE packetStringMessage = { 0 }; @@ -1993,9 +1993,9 @@ fail: static BOOL TsProxyCreateChannelWriteRequest(rdpTsg* tsg, CONTEXT_HANDLE* tunnelContext) { - size_t count; - wStream* s; - rdpRpc* rpc; + size_t count = 0; + wStream* s = NULL; + rdpRpc* rpc = NULL; WLog_Print(tsg->log, WLOG_DEBUG, "TsProxyCreateChannelWriteRequest"); if (!tsg || !tsg->rpc || !tunnelContext || !tsg->Hostname) @@ -2070,8 +2070,8 @@ fail: static BOOL TsProxyCloseChannelWriteRequest(rdpTsg* tsg, CONTEXT_HANDLE* context) { - wStream* s; - rdpRpc* rpc; + wStream* s = NULL; + rdpRpc* rpc = NULL; WLog_Print(tsg->log, WLOG_DEBUG, "TsProxyCloseChannelWriteRequest"); if (!tsg || !tsg->rpc || !context) @@ -2126,8 +2126,8 @@ fail: static BOOL TsProxyCloseTunnelWriteRequest(rdpTsg* tsg, const CONTEXT_HANDLE* context) { - wStream* s; - rdpRpc* rpc; + wStream* s = NULL; + rdpRpc* rpc = NULL; WLog_Print(tsg->log, WLOG_DEBUG, "TsProxyCloseTunnelWriteRequest"); if (!tsg || !tsg->rpc || !context) @@ -2183,8 +2183,8 @@ fail: static BOOL TsProxySetupReceivePipeWriteRequest(rdpTsg* tsg, const CONTEXT_HANDLE* channelContext) { - wStream* s; - rdpRpc* rpc; + wStream* s = NULL; + rdpRpc* rpc = NULL; WLog_Print(tsg->log, WLOG_DEBUG, "TsProxySetupReceivePipeWriteRequest"); WINPR_ASSERT(tsg); @@ -2299,8 +2299,8 @@ static BOOL tsg_proxy_reauth(rdpTsg* tsg) BOOL tsg_recv_pdu(rdpTsg* tsg, RPC_PDU* pdu) { BOOL rc = FALSE; - RpcClientCall* call; - rdpRpc* rpc; + RpcClientCall* call = NULL; + rdpRpc* rpc = NULL; WINPR_ASSERT(tsg); WINPR_ASSERT(pdu); @@ -2320,7 +2320,7 @@ BOOL tsg_recv_pdu(rdpTsg* tsg, RPC_PDU* pdu) { case TSG_STATE_INITIAL: { - CONTEXT_HANDLE* TunnelContext; + CONTEXT_HANDLE* TunnelContext = NULL; TunnelContext = (tsg->reauthSequence) ? &tsg->NewTunnelContext : &tsg->TunnelContext; if (!TsProxyCreateTunnelReadResponse(tsg, pdu, TunnelContext, &tsg->TunnelId)) @@ -2344,7 +2344,7 @@ BOOL tsg_recv_pdu(rdpTsg* tsg, RPC_PDU* pdu) case TSG_STATE_CONNECTED: { - CONTEXT_HANDLE* TunnelContext; + CONTEXT_HANDLE* TunnelContext = NULL; TunnelContext = (tsg->reauthSequence) ? &tsg->NewTunnelContext : &tsg->TunnelContext; if (!TsProxyAuthorizeTunnelReadResponse(tsg->log, pdu)) @@ -2637,12 +2637,12 @@ static BOOL tsg_set_machine_name(rdpTsg* tsg, const char* machineName) BOOL tsg_connect(rdpTsg* tsg, const char* hostname, UINT16 port, DWORD timeout) { UINT64 looptimeout = timeout * 1000ULL; - DWORD nCount; + DWORD nCount = 0; HANDLE events[MAXIMUM_WAIT_OBJECTS] = { 0 }; - rdpRpc* rpc; - rdpContext* context; - rdpSettings* settings; - rdpTransport* transport; + rdpRpc* rpc = NULL; + rdpContext* context = NULL; + rdpSettings* settings = NULL; + rdpTransport* transport = NULL; WINPR_ASSERT(tsg); @@ -2759,7 +2759,7 @@ BOOL tsg_disconnect(rdpTsg* tsg) static int tsg_read(rdpTsg* tsg, BYTE* data, size_t length) { - rdpRpc* rpc; + rdpRpc* rpc = NULL; int status = 0; if (!tsg || !data) @@ -2809,7 +2809,7 @@ static int tsg_read(rdpTsg* tsg, BYTE* data, size_t length) static int tsg_write(rdpTsg* tsg, const BYTE* data, UINT32 length) { - int status; + int status = 0; if (!tsg || !data || !tsg->rpc || !tsg->rpc->transport) return -1; @@ -2860,7 +2860,7 @@ void tsg_free(rdpTsg* tsg) static int transport_bio_tsg_write(BIO* bio, const char* buf, int num) { - int status; + int status = 0; rdpTsg* tsg = (rdpTsg*)BIO_get_data(bio); BIO_clear_flags(bio, BIO_FLAGS_WRITE); @@ -2888,7 +2888,7 @@ static int transport_bio_tsg_write(BIO* bio, const char* buf, int num) static int transport_bio_tsg_read(BIO* bio, char* buf, int size) { - int status; + int status = 0; rdpTsg* tsg = (rdpTsg*)BIO_get_data(bio); if (!tsg || (size < 0)) diff --git a/libfreerdp/core/gateway/websocket.c b/libfreerdp/core/gateway/websocket.c index 719cf23c6..554e67c34 100644 --- a/libfreerdp/core/gateway/websocket.c +++ b/libfreerdp/core/gateway/websocket.c @@ -25,13 +25,13 @@ BOOL websocket_write_wstream(BIO* bio, wStream* sPacket, WEBSOCKET_OPCODE opcode) { - size_t fullLen; - int status; - wStream* sWS; + size_t fullLen = 0; + int status = 0; + wStream* sWS = NULL; - uint32_t maskingKey; + uint32_t maskingKey = 0; - size_t streamPos; + size_t streamPos = 0; WINPR_ASSERT(bio); WINPR_ASSERT(sPacket); @@ -74,7 +74,7 @@ BOOL websocket_write_wstream(BIO* bio, wStream* sPacket, WEBSOCKET_OPCODE opcode /* mask as much as possible with 32bit access */ for (streamPos = 0; streamPos + 4 <= len; streamPos += 4) { - uint32_t data; + uint32_t data = 0; Stream_Read_UINT32(sPacket, data); Stream_Write_UINT32(sWS, data ^ maskingKey); } @@ -82,7 +82,7 @@ BOOL websocket_write_wstream(BIO* bio, wStream* sPacket, WEBSOCKET_OPCODE opcode /* mask the rest byte by byte */ for (; streamPos < len; streamPos++) { - BYTE data; + BYTE data = 0; BYTE* partialMask = ((BYTE*)&maskingKey) + (streamPos % 4); Stream_Read_UINT8(sPacket, data); Stream_Write_UINT8(sWS, data ^ *partialMask); @@ -135,14 +135,14 @@ static int websocket_write_all(BIO* bio, const BYTE* data, size_t length) int websocket_write(BIO* bio, const BYTE* buf, int isize, WEBSOCKET_OPCODE opcode) { - size_t payloadSize; - size_t fullLen; - int status; - wStream* sWS; + size_t payloadSize = 0; + size_t fullLen = 0; + int status = 0; + wStream* sWS = NULL; - uint32_t maskingKey; + uint32_t maskingKey = 0; - int streamPos; + int streamPos = 0; WINPR_ASSERT(bio); WINPR_ASSERT(buf); @@ -210,7 +210,7 @@ int websocket_write(BIO* bio, const BYTE* buf, int isize, WEBSOCKET_OPCODE opcod static int websocket_read_data(BIO* bio, BYTE* pBuffer, size_t size, websocket_context* encodingContext) { - int status; + int status = 0; WINPR_ASSERT(bio); WINPR_ASSERT(pBuffer); @@ -240,7 +240,7 @@ static int websocket_read_data(BIO* bio, BYTE* pBuffer, size_t size, static int websocket_read_discard(BIO* bio, websocket_context* encodingContext) { char _dummy[256] = { 0 }; - int status; + int status = 0; WINPR_ASSERT(bio); WINPR_ASSERT(encodingContext); @@ -266,7 +266,7 @@ static int websocket_read_discard(BIO* bio, websocket_context* encodingContext) static int websocket_read_wstream(BIO* bio, wStream* s, websocket_context* encodingContext) { - int status; + int status = 0; WINPR_ASSERT(bio); WINPR_ASSERT(s); @@ -307,11 +307,11 @@ static int websocket_read_wstream(BIO* bio, wStream* s, websocket_context* encod static BOOL websocket_reply_close(BIO* bio, wStream* s) { /* write back close */ - wStream* closeFrame; - uint16_t maskingKey1; - uint16_t maskingKey2; - int status; - size_t closeDataLen; + wStream* closeFrame = NULL; + uint16_t maskingKey1 = 0; + uint16_t maskingKey2 = 0; + int status = 0; + size_t closeDataLen = 0; WINPR_ASSERT(bio); @@ -332,7 +332,7 @@ static BOOL websocket_reply_close(BIO* bio, wStream* s) if (closeDataLen == 2) { - uint16_t data; + uint16_t data = 0; Stream_Read_UINT16(s, data); Stream_Write_UINT16(closeFrame, data ^ maskingKey1); } @@ -351,9 +351,9 @@ static BOOL websocket_reply_close(BIO* bio, wStream* s) static BOOL websocket_reply_pong(BIO* bio, wStream* s) { - wStream* closeFrame; - uint32_t maskingKey; - int status; + wStream* closeFrame = NULL; + uint32_t maskingKey = 0; + int status = 0; WINPR_ASSERT(bio); @@ -382,7 +382,7 @@ static BOOL websocket_reply_pong(BIO* bio, wStream* s) static int websocket_handle_payload(BIO* bio, BYTE* pBuffer, size_t size, websocket_context* encodingContext) { - int status; + int status = 0; WINPR_ASSERT(bio); WINPR_ASSERT(pBuffer); @@ -459,7 +459,7 @@ static int websocket_handle_payload(BIO* bio, BYTE* pBuffer, size_t size, int websocket_read(BIO* bio, BYTE* pBuffer, size_t size, websocket_context* encodingContext) { - int status; + int status = 0; int effectiveDataLen = 0; WINPR_ASSERT(bio); @@ -488,7 +488,7 @@ int websocket_read(BIO* bio, BYTE* pBuffer, size_t size, websocket_context* enco case WebsocketStateLengthAndMasking: { BYTE buffer[1]; - BYTE len; + BYTE len = 0; ERR_clear_error(); status = BIO_read(bio, (char*)buffer, sizeof(buffer)); if (status <= 0) diff --git a/libfreerdp/core/gateway/wst.c b/libfreerdp/core/gateway/wst.c index be85f4758..00581d33c 100644 --- a/libfreerdp/core/gateway/wst.c +++ b/libfreerdp/core/gateway/wst.c @@ -101,7 +101,7 @@ static BOOL wst_auth_init(rdpWst* wst, rdpTls* tls, TCHAR* authPkg) rdpContext* context = wst->context; rdpSettings* settings = context->settings; SEC_WINNT_AUTH_IDENTITY identity = { 0 }; - int rc; + int rc = 0; wst->auth_required = TRUE; if (!credssp_auth_init(wst->auth, authPkg, tls->Bindings)) @@ -162,13 +162,13 @@ static BOOL wst_set_auth_header(rdpCredsspAuth* auth, HttpRequest* request) static BOOL wst_recv_auth_token(rdpCredsspAuth* auth, HttpResponse* response) { - size_t len; + size_t len = 0; const char* token64 = NULL; size_t authTokenLength = 0; BYTE* authTokenData = NULL; SecBuffer authToken = { 0 }; - long StatusCode; - int rc; + long StatusCode = 0; + int rc = 0; if (!auth || !response) return FALSE; @@ -218,8 +218,8 @@ static BOOL wst_tls_connect(rdpWst* wst, rdpTls* tls, int timeout) rdpSettings* settings = wst->settings; const char* peerHostname = wst->gwhostname; UINT16 peerPort = wst->gwport; - const char* proxyUsername; - const char* proxyPassword; + const char* proxyUsername = NULL; + const char* proxyPassword = NULL; BOOL isProxyConnection = proxy_prepare(settings, &peerHostname, &peerPort, &proxyUsername, &proxyPassword); @@ -292,7 +292,7 @@ static wStream* wst_build_http_request(rdpWst* wst) { wStream* s = NULL; HttpRequest* request = NULL; - const char* uri; + const char* uri = NULL; if (!wst) return NULL; @@ -330,7 +330,7 @@ out: static BOOL wst_send_http_request(rdpWst* wst, rdpTls* tls) { - size_t sz; + size_t sz = 0; wStream* s = NULL; int status = -1; WINPR_ASSERT(wst); @@ -448,7 +448,7 @@ static BOOL wst_handle_denied(rdpWst* wst, HttpResponse** ppresponse, long* pSta BOOL wst_connect(rdpWst* wst, DWORD timeout) { HttpResponse* response = NULL; - long StatusCode; + long StatusCode = 0; WINPR_ASSERT(wst); if (!wst_tls_connect(wst, wst->tls, timeout)) @@ -529,7 +529,7 @@ DWORD wst_get_event_handles(rdpWst* wst, HANDLE* events, DWORD count) static int wst_bio_write(BIO* bio, const char* buf, int num) { - int status; + int status = 0; WINPR_ASSERT(bio); WINPR_ASSERT(buf); @@ -715,8 +715,8 @@ static BIO_METHOD* BIO_s_wst(void) static BOOL wst_parse_url(rdpWst* wst, const char* url) { - const char* hostStart; - const char* pos; + const char* hostStart = NULL; + const char* pos = NULL; WINPR_ASSERT(wst); WINPR_ASSERT(url); @@ -754,7 +754,7 @@ static BOOL wst_parse_url(rdpWst* wst, const char* url) if (*pos == ':') { char port[6]; - char* portNumberEnd; + char* portNumberEnd = NULL; pos++; const char* portStart = pos; while (*pos != '\0' && *pos != '/') @@ -779,7 +779,7 @@ static BOOL wst_parse_url(rdpWst* wst, const char* url) rdpWst* wst_new(rdpContext* context) { - rdpWst* wst; + rdpWst* wst = NULL; if (!context) return NULL; diff --git a/libfreerdp/core/gcc.c b/libfreerdp/core/gcc.c index 3d473f139..30f955ac1 100644 --- a/libfreerdp/core/gcc.c +++ b/libfreerdp/core/gcc.c @@ -358,10 +358,10 @@ static const BYTE h221_sc_key[4] = "McDn"; BOOL gcc_read_conference_create_request(wStream* s, rdpMcs* mcs) { - UINT16 length; - BYTE choice; - BYTE number; - BYTE selection; + UINT16 length = 0; + BYTE choice = 0; + BYTE number = 0; + BYTE selection = 0; WINPR_ASSERT(s); WINPR_ASSERT(mcs); @@ -465,12 +465,12 @@ BOOL gcc_write_conference_create_request(wStream* s, wStream* userData) BOOL gcc_read_conference_create_response(wStream* s, rdpMcs* mcs) { - UINT16 length; - UINT32 tag; - UINT16 nodeID; - BYTE result; - BYTE choice; - BYTE number; + UINT16 length = 0; + UINT32 tag = 0; + UINT16 nodeID = 0; + BYTE result = 0; + BYTE choice = 0; + BYTE number = 0; WINPR_ASSERT(s); WINPR_ASSERT(mcs); /* ConnectData */ @@ -782,10 +782,10 @@ char* gcc_block_type_string(UINT16 type, char* buffer, size_t size) BOOL gcc_read_server_data_blocks(wStream* s, rdpMcs* mcs, UINT16 length) { - UINT16 type; + UINT16 type = 0; UINT16 offset = 0; - UINT16 blockLength; - BYTE* holdp; + UINT16 blockLength = 0; + BYTE* holdp = NULL; WINPR_ASSERT(s); WINPR_ASSERT(mcs); @@ -793,9 +793,9 @@ BOOL gcc_read_server_data_blocks(wStream* s, rdpMcs* mcs, UINT16 length) while (offset < length) { char buffer[64] = { 0 }; - size_t rest; + size_t rest = 0; wStream subbuffer; - wStream* sub; + wStream* sub = NULL; if (!gcc_read_user_data_header(s, &type, &blockLength)) { @@ -1137,9 +1137,9 @@ BOOL gcc_read_client_core_data(wStream* s, rdpMcs* mcs) { char buffer[2048] = { 0 }; char strbuffer[130] = { 0 }; - UINT32 version; + UINT32 version = 0; BYTE connectionType = 0; - UINT32 clientColorDepth; + UINT32 clientColorDepth = 0; UINT16 colorDepth = 0; UINT16 postBeta2ColorDepth = 0; UINT16 highColorDepth = 0; @@ -1189,7 +1189,7 @@ BOOL gcc_read_client_core_data(wStream* s, rdpMcs* mcs) do { - UINT16 clientProductIdLen; + UINT16 clientProductIdLen = 0; if (blockLength < 2) break; @@ -1376,13 +1376,13 @@ BOOL gcc_write_client_core_data(wStream* s, const rdpMcs* mcs) char buffer[2048] = { 0 }; char dbuffer[2048] = { 0 }; WCHAR* clientName = NULL; - size_t clientNameLength; - BYTE connectionType; - HIGH_COLOR_DEPTH highColorDepth; + size_t clientNameLength = 0; + BYTE connectionType = 0; + HIGH_COLOR_DEPTH highColorDepth = HIGH_COLOR_4BPP; - UINT16 earlyCapabilityFlags; + UINT16 earlyCapabilityFlags = 0; WCHAR* clientDigProductId = NULL; - size_t clientDigProductIdLength; + size_t clientDigProductIdLength = 0; const rdpSettings* settings = mcs_get_const_settings(mcs); WINPR_ASSERT(s); @@ -1468,7 +1468,7 @@ BOOL gcc_write_client_core_data(wStream* s, const rdpMcs* mcs) BOOL gcc_read_server_core_data(wStream* s, rdpMcs* mcs) { - UINT32 serverVersion; + UINT32 serverVersion = 0; rdpSettings* settings = mcs_get_settings(mcs); WINPR_ASSERT(s); @@ -1810,7 +1810,7 @@ BOOL gcc_write_server_security_data(wStream* s, rdpMcs* mcs) BOOL gcc_read_client_network_data(wStream* s, rdpMcs* mcs) { - UINT32 i; + UINT32 i = 0; WINPR_ASSERT(s); WINPR_ASSERT(mcs); @@ -1865,8 +1865,8 @@ BOOL gcc_read_client_network_data(wStream* s, rdpMcs* mcs) BOOL gcc_write_client_network_data(wStream* s, const rdpMcs* mcs) { - UINT32 i; - UINT16 length; + UINT32 i = 0; + UINT16 length = 0; WINPR_ASSERT(s); WINPR_ASSERT(mcs); if (mcs->channelCount > 0) @@ -1890,10 +1890,10 @@ BOOL gcc_write_client_network_data(wStream* s, const rdpMcs* mcs) BOOL gcc_read_server_network_data(wStream* s, rdpMcs* mcs) { - UINT16 channelId; - UINT16 MCSChannelId; - UINT16 channelCount; - UINT32 parsedChannelCount; + UINT16 channelId = 0; + UINT16 MCSChannelId = 0; + UINT16 channelCount = 0; + UINT32 parsedChannelCount = 0; WINPR_ASSERT(s); WINPR_ASSERT(mcs); if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) @@ -1931,7 +1931,7 @@ BOOL gcc_read_server_network_data(wStream* s, rdpMcs* mcs) BOOL gcc_write_server_network_data(wStream* s, const rdpMcs* mcs) { - UINT32 i; + UINT32 i = 0; WINPR_ASSERT(s); WINPR_ASSERT(mcs); const size_t payloadLen = 8 + mcs->channelCount * 2 + (mcs->channelCount % 2 == 1 ? 2 : 0); @@ -1966,7 +1966,7 @@ BOOL gcc_write_server_network_data(wStream* s, const rdpMcs* mcs) BOOL gcc_read_client_cluster_data(wStream* s, rdpMcs* mcs) { char buffer[128] = { 0 }; - UINT32 redirectedSessionId; + UINT32 redirectedSessionId = 0; rdpSettings* settings = mcs_get_settings(mcs); WINPR_ASSERT(s); @@ -2014,7 +2014,7 @@ BOOL gcc_read_client_cluster_data(wStream* s, rdpMcs* mcs) BOOL gcc_write_client_cluster_data(wStream* s, const rdpMcs* mcs) { char buffer[128] = { 0 }; - UINT32 flags; + UINT32 flags = 0; const rdpSettings* settings = mcs_get_const_settings(mcs); WINPR_ASSERT(s); @@ -2059,8 +2059,8 @@ BOOL gcc_write_client_cluster_data(wStream* s, const rdpMcs* mcs) BOOL gcc_read_client_monitor_data(wStream* s, rdpMcs* mcs) { - UINT32 index; - UINT32 monitorCount; + UINT32 index = 0; + UINT32 monitorCount = 0; rdpSettings* settings = mcs_get_settings(mcs); WINPR_ASSERT(s); @@ -2097,11 +2097,11 @@ BOOL gcc_read_client_monitor_data(wStream* s, rdpMcs* mcs) for (index = 0; index < monitorCount; index++) { - UINT32 left; - UINT32 top; - UINT32 right; - UINT32 bottom; - UINT32 flags; + UINT32 left = 0; + UINT32 top = 0; + UINT32 right = 0; + UINT32 bottom = 0; + UINT32 flags = 0; rdpMonitor* current = &settings->MonitorDefArray[index]; Stream_Read_UINT32(s, left); /* left */ @@ -2130,8 +2130,8 @@ BOOL gcc_read_client_monitor_data(wStream* s, rdpMcs* mcs) BOOL gcc_write_client_monitor_data(wStream* s, const rdpMcs* mcs) { - UINT32 i; - UINT16 length; + UINT32 i = 0; + UINT16 length = 0; INT32 baseX = 0; INT32 baseY = 0; const rdpSettings* settings = mcs_get_const_settings(mcs); @@ -2186,9 +2186,9 @@ BOOL gcc_write_client_monitor_data(wStream* s, const rdpMcs* mcs) BOOL gcc_read_client_monitor_extended_data(wStream* s, rdpMcs* mcs) { - UINT32 index; - UINT32 monitorCount; - UINT32 monitorAttributeSize; + UINT32 index = 0; + UINT32 monitorCount = 0; + UINT32 monitorAttributeSize = 0; rdpSettings* settings = mcs_get_settings(mcs); WINPR_ASSERT(s); @@ -2228,8 +2228,8 @@ BOOL gcc_read_client_monitor_extended_data(wStream* s, rdpMcs* mcs) BOOL gcc_write_client_monitor_extended_data(wStream* s, const rdpMcs* mcs) { - UINT32 i; - UINT16 length; + UINT32 i = 0; + UINT16 length = 0; const rdpSettings* settings = mcs_get_const_settings(mcs); WINPR_ASSERT(s); @@ -2308,7 +2308,7 @@ BOOL gcc_write_client_message_channel_data(wStream* s, const rdpMcs* mcs) BOOL gcc_read_server_message_channel_data(wStream* s, rdpMcs* mcs) { - UINT16 MCSChannelId; + UINT16 MCSChannelId = 0; WINPR_ASSERT(s); WINPR_ASSERT(mcs); if (!Stream_CheckAndLogRequiredLength(TAG, s, 2)) @@ -2354,7 +2354,7 @@ BOOL gcc_read_client_multitransport_channel_data(wStream* s, rdpMcs* mcs) if (blockLength < 4) return FALSE; - UINT32 remoteFlags; + UINT32 remoteFlags = 0; Stream_Read_UINT32(s, remoteFlags); settings->MultitransportFlags &= remoteFlags; /* merge local and remote flags */ return TRUE; @@ -2385,7 +2385,7 @@ BOOL gcc_write_client_multitransport_channel_data(wStream* s, const rdpMcs* mcs) BOOL gcc_read_server_multitransport_channel_data(wStream* s, rdpMcs* mcs) { rdpSettings* settings = mcs_get_settings(mcs); - UINT32 remoteFlags; + UINT32 remoteFlags = 0; WINPR_ASSERT(s); WINPR_ASSERT(settings); diff --git a/libfreerdp/core/graphics.c b/libfreerdp/core/graphics.c index a511a9f8b..a437f7412 100644 --- a/libfreerdp/core/graphics.c +++ b/libfreerdp/core/graphics.c @@ -29,8 +29,8 @@ rdpBitmap* Bitmap_Alloc(rdpContext* context) { - rdpBitmap* bitmap; - rdpGraphics* graphics; + rdpBitmap* bitmap = NULL; + rdpGraphics* graphics = NULL; graphics = context->graphics; bitmap = (rdpBitmap*)calloc(1, graphics->Bitmap_Prototype->size); @@ -85,8 +85,8 @@ void graphics_register_bitmap(rdpGraphics* graphics, const rdpBitmap* bitmap) /* Pointer Class */ rdpPointer* Pointer_Alloc(rdpContext* context) { - rdpPointer* pointer; - rdpGraphics* graphics; + rdpPointer* pointer = NULL; + rdpGraphics* graphics = NULL; graphics = context->graphics; pointer = (rdpPointer*)calloc(1, graphics->Pointer_Prototype->size); @@ -113,8 +113,8 @@ void graphics_register_pointer(rdpGraphics* graphics, const rdpPointer* pointer) rdpGlyph* Glyph_Alloc(rdpContext* context, INT32 x, INT32 y, UINT32 cx, UINT32 cy, UINT32 cb, const BYTE* aj) { - rdpGlyph* glyph; - rdpGraphics* graphics; + rdpGlyph* glyph = NULL; + rdpGraphics* graphics = NULL; if (!context || !context->graphics) return NULL; @@ -168,7 +168,7 @@ void graphics_register_glyph(rdpGraphics* graphics, const rdpGlyph* glyph) rdpGraphics* graphics_new(rdpContext* context) { - rdpGraphics* graphics; + rdpGraphics* graphics = NULL; graphics = (rdpGraphics*)calloc(1, sizeof(rdpGraphics)); if (graphics) diff --git a/libfreerdp/core/heartbeat.c b/libfreerdp/core/heartbeat.c index d45400deb..1fb608962 100644 --- a/libfreerdp/core/heartbeat.c +++ b/libfreerdp/core/heartbeat.c @@ -25,11 +25,11 @@ state_run_t rdp_recv_heartbeat_packet(rdpRdp* rdp, wStream* s) { - BYTE reserved; - BYTE period; - BYTE count1; - BYTE count2; - BOOL rc; + BYTE reserved = 0; + BYTE period = 0; + BYTE count1 = 0; + BYTE count2 = 0; + BOOL rc = 0; WINPR_ASSERT(rdp); WINPR_ASSERT(rdp->context); diff --git a/libfreerdp/core/info.c b/libfreerdp/core/info.c index 30fcd9bb6..093d22040 100644 --- a/libfreerdp/core/info.c +++ b/libfreerdp/core/info.c @@ -120,9 +120,9 @@ static BOOL rdp_read_info_null_string(rdpSettings* settings, FreeRDP_Settings_Ke static char* rdp_info_package_flags_description(UINT32 flags) { - char* result; + char* result = NULL; size_t maximum_size = 1 + MAX_LABEL_LENGTH * ARRAYSIZE(info_flags); - size_t i; + size_t i = 0; result = calloc(maximum_size, sizeof(char)); @@ -145,8 +145,8 @@ static BOOL rdp_compute_client_auto_reconnect_cookie(rdpRdp* rdp) { BYTE ClientRandom[CLIENT_RANDOM_LENGTH] = { 0 }; BYTE AutoReconnectRandom[32] = { 0 }; - ARC_SC_PRIVATE_PACKET* serverCookie; - ARC_CS_PRIVATE_PACKET* clientCookie; + ARC_SC_PRIVATE_PACKET* serverCookie = NULL; + ARC_CS_PRIVATE_PACKET* clientCookie = NULL; WINPR_ASSERT(rdp); rdpSettings* settings = rdp->settings; @@ -180,8 +180,8 @@ static BOOL rdp_compute_client_auto_reconnect_cookie(rdpRdp* rdp) static BOOL rdp_read_server_auto_reconnect_cookie(rdpRdp* rdp, wStream* s, logon_info_ex* info) { - BYTE* p; - ARC_SC_PRIVATE_PACKET* autoReconnectCookie; + BYTE* p = NULL; + ARC_SC_PRIVATE_PACKET* autoReconnectCookie = NULL; rdpSettings* settings = rdp->settings; autoReconnectCookie = settings->ServerAutoReconnectCookie; @@ -214,7 +214,7 @@ static BOOL rdp_read_server_auto_reconnect_cookie(rdpRdp* rdp, wStream* s, logon if ((settings->PrintReconnectCookie)) { - char* base64; + char* base64 = NULL; base64 = crypto_base64_encode((BYTE*)autoReconnectCookie, sizeof(ARC_SC_PRIVATE_PACKET)); WLog_INFO(TAG, "Reconnect-cookie: %s", base64); free(base64); @@ -230,7 +230,7 @@ static BOOL rdp_read_server_auto_reconnect_cookie(rdpRdp* rdp, wStream* s, logon static BOOL rdp_read_client_auto_reconnect_cookie(rdpRdp* rdp, wStream* s) { - ARC_CS_PRIVATE_PACKET* autoReconnectCookie; + ARC_CS_PRIVATE_PACKET* autoReconnectCookie = NULL; rdpSettings* settings = rdp->settings; autoReconnectCookie = settings->ClientAutoReconnectCookie; @@ -251,9 +251,9 @@ static BOOL rdp_read_client_auto_reconnect_cookie(rdpRdp* rdp, wStream* s) static BOOL rdp_write_client_auto_reconnect_cookie(rdpRdp* rdp, wStream* s) { - BYTE* p; - ARC_CS_PRIVATE_PACKET* autoReconnectCookie; - rdpSettings* settings; + BYTE* p = NULL; + ARC_CS_PRIVATE_PACKET* autoReconnectCookie = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(rdp); @@ -290,8 +290,8 @@ static BOOL rdp_write_client_auto_reconnect_cookie(rdpRdp* rdp, wStream* s) static size_t rdp_get_client_address_max_size(const rdpRdp* rdp) { - UINT32 version; - rdpSettings* settings; + UINT32 version = 0; + rdpSettings* settings = NULL; WINPR_ASSERT(rdp); @@ -655,13 +655,13 @@ static BOOL rdp_read_info_string(rdpSettings* settings, FreeRDP_Settings_Keys_St static BOOL rdp_read_info_packet(rdpRdp* rdp, wStream* s, UINT16 tpktlength) { BOOL smallsize = FALSE; - UINT32 flags; - UINT16 cbDomain; - UINT16 cbUserName; - UINT16 cbPassword; - UINT16 cbAlternateShell; - UINT16 cbWorkingDir; - UINT32 CompressionLevel; + UINT32 flags = 0; + UINT16 cbDomain = 0; + UINT16 cbUserName = 0; + UINT16 cbPassword = 0; + UINT16 cbAlternateShell = 0; + UINT16 cbWorkingDir = 0; + UINT32 CompressionLevel = 0; rdpSettings* settings = rdp->settings; if (!Stream_CheckAndLogRequiredLength(TAG, s, 18)) @@ -739,7 +739,7 @@ static BOOL rdp_read_info_packet(rdpRdp* rdp, wStream* s, UINT16 tpktlength) static BOOL rdp_write_info_packet(rdpRdp* rdp, wStream* s) { BOOL ret = FALSE; - UINT32 flags; + UINT32 flags = 0; WCHAR* domainW = NULL; size_t cbDomain = 0; WCHAR* userNameW = NULL; @@ -751,7 +751,7 @@ static BOOL rdp_write_info_packet(rdpRdp* rdp, wStream* s) WCHAR* workingDirW = NULL; size_t cbWorkingDir = 0; BOOL usedPasswordCookie = FALSE; - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(rdp); settings = rdp->settings; @@ -868,7 +868,7 @@ static BOOL rdp_write_info_packet(rdpRdp* rdp, wStream* s) cbPassword = (UINT16)cbPassword * sizeof(WCHAR); } - const char* altShell; + const char* altShell = NULL; if (!settings->RemoteAssistanceMode) altShell = freerdp_settings_get_string(settings, FreeRDP_AlternateShell); else if (settings->RemoteAssistancePassStub) @@ -968,8 +968,8 @@ fail: BOOL rdp_recv_client_info(rdpRdp* rdp, wStream* s) { - UINT16 length; - UINT16 channelId; + UINT16 length = 0; + UINT16 channelId = 0; UINT16 securityFlags = 0; WINPR_ASSERT(rdp_get_state(rdp) == CONNECTION_STATE_SECURE_SETTINGS_EXCHANGE); @@ -1009,7 +1009,7 @@ BOOL rdp_recv_client_info(rdpRdp* rdp, wStream* s) BOOL rdp_send_client_info(rdpRdp* rdp) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(rdp); rdp->sec_flags |= SEC_INFO_PKT; s = rdp_send_stream_init(rdp); @@ -1083,8 +1083,8 @@ static BOOL rdp_info_read_string(const char* what, wStream* s, size_t size, size static BOOL rdp_recv_logon_info_v1(rdpRdp* rdp, wStream* s, logon_info* info) { - UINT32 cbDomain; - UINT32 cbUserName; + UINT32 cbDomain = 0; + UINT32 cbUserName = 0; WINPR_UNUSED(rdp); WINPR_ASSERT(info); @@ -1120,10 +1120,10 @@ fail: static BOOL rdp_recv_logon_info_v2(rdpRdp* rdp, wStream* s, logon_info* info) { - UINT16 Version; - UINT32 Size; - UINT32 cbDomain; - UINT32 cbUserName; + UINT16 Version = 0; + UINT32 Size = 0; + UINT32 cbDomain = 0; + UINT32 cbUserName = 0; WINPR_ASSERT(rdp); WINPR_ASSERT(s); @@ -1227,9 +1227,9 @@ static BOOL rdp_recv_logon_plain_notify(rdpRdp* rdp, wStream* s) static BOOL rdp_recv_logon_error_info(rdpRdp* rdp, wStream* s, logon_info_ex* info) { - freerdp* instance; - UINT32 errorNotificationType; - UINT32 errorNotificationData; + freerdp* instance = NULL; + UINT32 errorNotificationType = 0; + UINT32 errorNotificationData = 0; WINPR_ASSERT(rdp); WINPR_ASSERT(rdp->context); @@ -1254,9 +1254,9 @@ static BOOL rdp_recv_logon_error_info(rdpRdp* rdp, wStream* s, logon_info_ex* in static BOOL rdp_recv_logon_info_extended(rdpRdp* rdp, wStream* s, logon_info_ex* info) { - UINT32 cbFieldData; - UINT32 fieldsPresent; - UINT16 Length; + UINT32 cbFieldData = 0; + UINT32 fieldsPresent = 0; + UINT16 Length = 0; WINPR_ASSERT(rdp); WINPR_ASSERT(s); @@ -1324,8 +1324,8 @@ static BOOL rdp_recv_logon_info_extended(rdpRdp* rdp, wStream* s, logon_info_ex* BOOL rdp_recv_save_session_info(rdpRdp* rdp, wStream* s) { - UINT32 infoType; - BOOL status; + UINT32 infoType = 0; + BOOL status = 0; logon_info logonInfo = { 0 }; logon_info_ex logonInfoEx = { 0 }; rdpContext* context = rdp->context; @@ -1394,7 +1394,7 @@ static BOOL rdp_write_logon_info_v1(wStream* s, logon_info* info) const size_t userCharLen = 512 / sizeof(WCHAR); size_t sz = 4 + 52 + 4 + 512 + 4; - size_t len; + size_t len = 0; if (!Stream_EnsureRemainingCapacity(s, sz)) return FALSE; @@ -1424,8 +1424,8 @@ static BOOL rdp_write_logon_info_v1(wStream* s, logon_info* info) static BOOL rdp_write_logon_info_v2(wStream* s, logon_info* info) { - size_t domainLen; - size_t usernameLen; + size_t domainLen = 0; + size_t usernameLen = 0; if (!Stream_EnsureRemainingCapacity(s, logonInfoV2TotalSize)) return FALSE; @@ -1508,8 +1508,8 @@ static BOOL rdp_write_logon_info_ex(wStream* s, logon_info_ex* info) BOOL rdp_send_save_session_info(rdpContext* context, UINT32 type, void* data) { - wStream* s; - BOOL status; + wStream* s = NULL; + BOOL status = 0; rdpRdp* rdp = context->rdp; s = rdp_data_pdu_init(rdp); @@ -1552,7 +1552,7 @@ BOOL rdp_send_save_session_info(rdpContext* context, UINT32 type, void* data) BOOL rdp_send_server_status_info(rdpContext* context, UINT32 status) { - wStream* s; + wStream* s = NULL; rdpRdp* rdp = context->rdp; s = rdp_data_pdu_init(rdp); diff --git a/libfreerdp/core/input.c b/libfreerdp/core/input.c index 481ff3e70..fd6b7a0d5 100644 --- a/libfreerdp/core/input.c +++ b/libfreerdp/core/input.c @@ -60,7 +60,7 @@ static void rdp_write_input_event_header(wStream* s, UINT32 time, UINT16 type) static wStream* rdp_client_input_pdu_init(rdpRdp* rdp, UINT16 type) { - wStream* s; + wStream* s = NULL; s = rdp_data_pdu_init(rdp); if (!s) @@ -97,8 +97,8 @@ static BOOL input_ensure_client_running(rdpInput* input) static BOOL input_send_synchronize_event(rdpInput* input, UINT32 flags) { - wStream* s; - rdpRdp* rdp; + wStream* s = NULL; + rdpRdp* rdp = NULL; if (!input || !input->context) return FALSE; @@ -129,8 +129,8 @@ static void input_write_keyboard_event(wStream* s, UINT16 flags, UINT16 code) static BOOL input_send_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code) { - wStream* s; - rdpRdp* rdp; + wStream* s = NULL; + rdpRdp* rdp = NULL; if (!input || !input->context) return FALSE; @@ -158,8 +158,8 @@ static void input_write_unicode_keyboard_event(wStream* s, UINT16 flags, UINT16 static BOOL input_send_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code) { - wStream* s; - rdpRdp* rdp; + wStream* s = NULL; + rdpRdp* rdp = NULL; if (!input || !input->context) return FALSE; @@ -192,8 +192,8 @@ static void input_write_mouse_event(wStream* s, UINT16 flags, UINT16 x, UINT16 y static BOOL input_send_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y) { - wStream* s; - rdpRdp* rdp; + wStream* s = NULL; + rdpRdp* rdp = NULL; if (!input || !input->context || !input->context->settings) return FALSE; @@ -226,8 +226,8 @@ static BOOL input_send_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT static BOOL input_send_relmouse_event(rdpInput* input, UINT16 flags, INT16 xDelta, INT16 yDelta) { - wStream* s; - rdpRdp* rdp; + wStream* s = NULL; + rdpRdp* rdp = NULL; if (!input || !input->context || !input->context->settings) return FALSE; @@ -264,8 +264,8 @@ static void input_write_extended_mouse_event(wStream* s, UINT16 flags, UINT16 x, static BOOL input_send_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y) { - wStream* s; - rdpRdp* rdp; + wStream* s = NULL; + rdpRdp* rdp = NULL; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -337,8 +337,8 @@ static BOOL input_send_keyboard_pause_event(rdpInput* input) static BOOL input_send_fastpath_synchronize_event(rdpInput* input, UINT32 flags) { - wStream* s; - rdpRdp* rdp; + wStream* s = NULL; + rdpRdp* rdp = NULL; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -360,9 +360,9 @@ static BOOL input_send_fastpath_synchronize_event(rdpInput* input, UINT32 flags) static BOOL input_send_fastpath_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code) { - wStream* s; + wStream* s = NULL; BYTE eventFlags = 0; - rdpRdp* rdp; + rdpRdp* rdp = NULL; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -388,9 +388,9 @@ static BOOL input_send_fastpath_keyboard_event(rdpInput* input, UINT16 flags, UI static BOOL input_send_fastpath_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code) { - wStream* s; + wStream* s = NULL; BYTE eventFlags = 0; - rdpRdp* rdp; + rdpRdp* rdp = NULL; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -420,8 +420,8 @@ static BOOL input_send_fastpath_unicode_keyboard_event(rdpInput* input, UINT16 f static BOOL input_send_fastpath_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y) { - wStream* s; - rdpRdp* rdp; + wStream* s = NULL; + rdpRdp* rdp = NULL; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -457,8 +457,8 @@ static BOOL input_send_fastpath_mouse_event(rdpInput* input, UINT16 flags, UINT1 static BOOL input_send_fastpath_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y) { - wStream* s; - rdpRdp* rdp; + wStream* s = NULL; + rdpRdp* rdp = NULL; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -490,8 +490,8 @@ static BOOL input_send_fastpath_extended_mouse_event(rdpInput* input, UINT16 fla static BOOL input_send_fastpath_relmouse_event(rdpInput* input, UINT16 flags, INT16 xDelta, INT16 yDelta) { - wStream* s; - rdpRdp* rdp; + wStream* s = NULL; + rdpRdp* rdp = NULL; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -555,9 +555,9 @@ static BOOL input_send_fastpath_qoe_event(rdpInput* input, UINT32 timestampMS) static BOOL input_send_fastpath_focus_in_event(rdpInput* input, UINT16 toggleStates) { - wStream* s; + wStream* s = NULL; BYTE eventFlags = 0; - rdpRdp* rdp; + rdpRdp* rdp = NULL; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -593,10 +593,10 @@ static BOOL input_send_fastpath_keyboard_pause_event(rdpInput* input) * and pause-up sent nothing. However, reverse engineering mstsc shows * it sending the following sequence: */ - wStream* s; + wStream* s = NULL; const BYTE keyDownEvent = FASTPATH_INPUT_EVENT_SCANCODE << 5; const BYTE keyUpEvent = (FASTPATH_INPUT_EVENT_SCANCODE << 5) | FASTPATH_INPUT_KBDFLAGS_RELEASE; - rdpRdp* rdp; + rdpRdp* rdp = NULL; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -629,7 +629,7 @@ static BOOL input_send_fastpath_keyboard_pause_event(rdpInput* input) static BOOL input_recv_sync_event(rdpInput* input, wStream* s) { - UINT32 toggleFlags; + UINT32 toggleFlags = 0; WINPR_ASSERT(input); WINPR_ASSERT(s); @@ -644,8 +644,8 @@ static BOOL input_recv_sync_event(rdpInput* input, wStream* s) static BOOL input_recv_keyboard_event(rdpInput* input, wStream* s) { - UINT16 keyboardFlags; - UINT16 keyCode; + UINT16 keyboardFlags = 0; + UINT16 keyCode = 0; WINPR_ASSERT(input); WINPR_ASSERT(s); @@ -671,8 +671,8 @@ static BOOL input_recv_keyboard_event(rdpInput* input, wStream* s) static BOOL input_recv_unicode_keyboard_event(rdpInput* input, wStream* s) { - UINT16 keyboardFlags; - UINT16 unicodeCode; + UINT16 keyboardFlags = 0; + UINT16 unicodeCode = 0; WINPR_ASSERT(input); WINPR_ASSERT(s); @@ -694,9 +694,9 @@ static BOOL input_recv_unicode_keyboard_event(rdpInput* input, wStream* s) static BOOL input_recv_mouse_event(rdpInput* input, wStream* s) { - UINT16 pointerFlags; - UINT16 xPos; - UINT16 yPos; + UINT16 pointerFlags = 0; + UINT16 xPos = 0; + UINT16 yPos = 0; WINPR_ASSERT(input); WINPR_ASSERT(s); @@ -712,9 +712,9 @@ static BOOL input_recv_mouse_event(rdpInput* input, wStream* s) static BOOL input_recv_relmouse_event(rdpInput* input, wStream* s) { - UINT16 pointerFlags; - INT16 xDelta; - INT16 yDelta; + UINT16 pointerFlags = 0; + INT16 xDelta = 0; + INT16 yDelta = 0; WINPR_ASSERT(input); WINPR_ASSERT(s); @@ -740,9 +740,9 @@ static BOOL input_recv_relmouse_event(rdpInput* input, wStream* s) static BOOL input_recv_extended_mouse_event(rdpInput* input, wStream* s) { - UINT16 pointerFlags; - UINT16 xPos; - UINT16 yPos; + UINT16 pointerFlags = 0; + UINT16 xPos = 0; + UINT16 yPos = 0; WINPR_ASSERT(input); WINPR_ASSERT(s); @@ -768,7 +768,7 @@ static BOOL input_recv_extended_mouse_event(rdpInput* input, wStream* s) static BOOL input_recv_event(rdpInput* input, wStream* s) { - UINT16 messageType; + UINT16 messageType = 0; WINPR_ASSERT(input); WINPR_ASSERT(s); @@ -829,8 +829,8 @@ static BOOL input_recv_event(rdpInput* input, wStream* s) BOOL input_recv(rdpInput* input, wStream* s) { - UINT16 i; - UINT16 numberEvents; + UINT16 i = 0; + UINT16 numberEvents = 0; WINPR_ASSERT(input); WINPR_ASSERT(s); @@ -856,7 +856,7 @@ BOOL input_recv(rdpInput* input, wStream* s) BOOL input_register_client_callbacks(rdpInput* input) { - rdpSettings* settings; + rdpSettings* settings = NULL; if (!input->context) return FALSE; diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c index 70475a29c..99d4fa25f 100644 --- a/libfreerdp/core/license.c +++ b/libfreerdp/core/license.c @@ -395,7 +395,7 @@ static void license_print_scope_list(const SCOPE_LIST* scopeList) for (UINT32 index = 0; index < scopeList->count; index++) { - const LICENSE_BLOB* scope; + const LICENSE_BLOB* scope = NULL; WINPR_ASSERT(scopeList->array); scope = scopeList->array[index]; @@ -512,7 +512,7 @@ static BOOL saveCal(const rdpSettings* settings, const BYTE* data, size_t length char* filepath = NULL; char* filepathNew = NULL; - size_t written; + size_t written = 0; BOOL ret = FALSE; const char* path = freerdp_settings_get_string(settings, FreeRDP_ConfigPath); @@ -1133,7 +1133,7 @@ BOOL license_generate_hwid(rdpLicense* license) static BOOL license_get_server_rsa_public_key(rdpLicense* license) { - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(license); WINPR_ASSERT(license->certificate); @@ -1793,7 +1793,7 @@ static BOOL license_check_preferred_alg(rdpLicense* license, UINT32 PreferredKey BOOL license_read_license_info(rdpLicense* license, wStream* s) { BOOL rc = FALSE; - UINT32 PreferredKeyExchangeAlg; + UINT32 PreferredKeyExchangeAlg = 0; WINPR_ASSERT(license); WINPR_ASSERT(license->certificate); @@ -2223,8 +2223,8 @@ fail: BOOL license_read_error_alert_packet(rdpLicense* license, wStream* s) { - UINT32 dwErrorCode; - UINT32 dwStateTransition; + UINT32 dwErrorCode = 0; + UINT32 dwStateTransition = 0; WINPR_ASSERT(license); WINPR_ASSERT(license->rdp); @@ -2321,7 +2321,7 @@ BOOL license_write_new_license_request_packet(const rdpLicense* license, wStream BOOL license_read_new_license_request_packet(rdpLicense* license, wStream* s) { - UINT32 PreferredKeyExchangeAlg; + UINT32 PreferredKeyExchangeAlg = 0; WINPR_ASSERT(license); @@ -2373,11 +2373,11 @@ BOOL license_read_new_license_request_packet(rdpLicense* license, wStream* s) BOOL license_answer_license_request(rdpLicense* license) { - wStream* s; + wStream* s = NULL; BYTE* license_data = NULL; size_t license_size = 0; - BOOL status; - char* username; + BOOL status = 0; + char* username = NULL; WINPR_ASSERT(license); WINPR_ASSERT(license->rdp); @@ -2474,9 +2474,9 @@ BOOL license_answer_license_request(rdpLicense* license) BOOL license_send_platform_challenge_response(rdpLicense* license) { wStream* s = license_send_stream_init(license); - wStream* challengeRespData; - BYTE* buffer; - BOOL status; + wStream* challengeRespData = NULL; + BYTE* buffer = NULL; + BOOL status = 0; WINPR_ASSERT(license); WINPR_ASSERT(license->PlatformChallenge); @@ -2555,9 +2555,9 @@ BOOL license_send_platform_challenge_response(rdpLicense* license) BOOL license_read_platform_challenge_response(rdpLicense* license, wStream* s) { - UINT16 wVersion; - UINT16 cbChallenge; - const BYTE* pbChallenge; + UINT16 wVersion = 0; + UINT16 cbChallenge = 0; + const BYTE* pbChallenge = NULL; WINPR_ASSERT(license); WINPR_ASSERT(license->PlatformChallenge); @@ -2653,7 +2653,7 @@ BOOL license_send_valid_client_error_packet(rdpRdp* rdp) rdpLicense* license_new(rdpRdp* rdp) { - rdpLicense* license; + rdpLicense* license = NULL; WINPR_ASSERT(rdp); license = (rdpLicense*)calloc(1, sizeof(rdpLicense)); diff --git a/libfreerdp/core/listener.c b/libfreerdp/core/listener.c index 1e9976992..9fa16cd43 100644 --- a/libfreerdp/core/listener.c +++ b/libfreerdp/core/listener.c @@ -128,13 +128,13 @@ static BOOL freerdp_listener_open_from_vsock(freerdp_listener* instance, const c static BOOL freerdp_listener_open(freerdp_listener* instance, const char* bind_address, UINT16 port) { int ai_flags = 0; - int status; - int sockfd; + int status = 0; + int sockfd = 0; char addr[64]; - void* sin_addr; - int option_value; - struct addrinfo* ai; - struct addrinfo* res; + void* sin_addr = NULL; + int option_value = 0; + struct addrinfo* ai = NULL; + struct addrinfo* res = NULL; rdpListener* listener = (rdpListener*)instance->listener; #ifdef _WIN32 u_long arg; @@ -237,11 +237,11 @@ static BOOL freerdp_listener_open(freerdp_listener* instance, const char* bind_a static BOOL freerdp_listener_open_local(freerdp_listener* instance, const char* path) { #ifndef _WIN32 - int status; - int sockfd; + int status = 0; + int sockfd = 0; struct sockaddr_un addr = { 0 }; rdpListener* listener = (rdpListener*)instance->listener; - HANDLE hevent; + HANDLE hevent = NULL; if (listener->num_sockfds == MAX_LISTENER_HANDLES) { @@ -330,7 +330,7 @@ static BOOL freerdp_listener_open_from_socket(freerdp_listener* instance, int fd static void freerdp_listener_close(freerdp_listener* instance) { - int i; + int i = 0; rdpListener* listener = (rdpListener*)instance->listener; for (i = 0; i < listener->num_sockfds; i++) @@ -345,7 +345,7 @@ static void freerdp_listener_close(freerdp_listener* instance) #if defined(WITH_FREERDP_DEPRECATED) static BOOL freerdp_listener_get_fds(freerdp_listener* instance, void** rfds, int* rcount) { - int index; + int index = 0; rdpListener* listener = (rdpListener*)instance->listener; if (listener->num_sockfds < 1) @@ -364,7 +364,7 @@ static BOOL freerdp_listener_get_fds(freerdp_listener* instance, void** rfds, in static DWORD freerdp_listener_get_event_handles(freerdp_listener* instance, HANDLE* events, DWORD nCount) { - int index; + int index = 0; rdpListener* listener = (rdpListener*)instance->listener; if (listener->num_sockfds < 1) @@ -506,8 +506,8 @@ static BOOL freerdp_listener_check_fds(freerdp_listener* instance) freerdp_listener* freerdp_listener_new(void) { - freerdp_listener* instance; - rdpListener* listener; + freerdp_listener* instance = NULL; + rdpListener* listener = NULL; instance = (freerdp_listener*)calloc(1, sizeof(freerdp_listener)); if (!instance) diff --git a/libfreerdp/core/mcs.c b/libfreerdp/core/mcs.c index 3768f6242..e45fe001c 100644 --- a/libfreerdp/core/mcs.c +++ b/libfreerdp/core/mcs.c @@ -300,7 +300,7 @@ static BOOL mcs_read_domain_mcspdu_header(wStream* s, DomainMCSPDU domainMCSPDU, static int mcs_initialize_client_channels(rdpMcs* mcs, const rdpSettings* settings) { - UINT32 index; + UINT32 index = 0; if (!mcs || !settings) return -1; @@ -337,9 +337,8 @@ static int mcs_initialize_client_channels(rdpMcs* mcs, const rdpSettings* settin BOOL mcs_read_domain_mcspdu_header(wStream* s, DomainMCSPDU domainMCSPDU, UINT16* length, DomainMCSPDU* actual) { - UINT16 li; - BYTE choice; - DomainMCSPDU MCSPDU; + UINT16 li = 0; + BYTE choice = 0; if (actual) *actual = DomainMCSPDU_invalid; @@ -357,7 +356,7 @@ BOOL mcs_read_domain_mcspdu_header(wStream* s, DomainMCSPDU domainMCSPDU, UINT16 if (!per_read_choice(s, &choice)) return FALSE; - MCSPDU = (choice >> 2); + const DomainMCSPDU MCSPDU = (choice >> 2); if (actual) *actual = MCSPDU; @@ -450,8 +449,8 @@ static BOOL mcs_read_domain_parameters(wStream* s, DomainParameters* domainParam static BOOL mcs_write_domain_parameters(wStream* s, DomainParameters* domainParameters) { - size_t length; - wStream* tmps; + size_t length = 0; + wStream* tmps = NULL; if (!s || !domainParameters) return FALSE; @@ -720,8 +719,8 @@ BOOL mcs_recv_connect_initial(rdpMcs* mcs, wStream* s) BOOL mcs_write_connect_initial(wStream* s, rdpMcs* mcs, wStream* userData) { - size_t length; - wStream* tmps; + size_t length = 0; + wStream* tmps = NULL; BOOL ret = FALSE; if (!s || !mcs || !userData) @@ -778,8 +777,8 @@ out: BOOL mcs_write_connect_response(wStream* s, rdpMcs* mcs, wStream* userData) { - size_t length; - wStream* tmps; + size_t length = 0; + wStream* tmps = NULL; BOOL ret = FALSE; if (!s || !mcs || !userData) @@ -819,13 +818,13 @@ out: static BOOL mcs_send_connect_initial(rdpMcs* mcs) { int status = -1; - size_t length; + size_t length = 0; wStream* s = NULL; - size_t bm; - size_t em; + size_t bm = 0; + size_t em = 0; wStream* gcc_CCrq = NULL; wStream* client_data = NULL; - rdpContext* context; + rdpContext* context = NULL; if (!mcs) return FALSE; @@ -899,11 +898,11 @@ out: BOOL mcs_recv_connect_response(rdpMcs* mcs, wStream* s) { - size_t length; - UINT16 tlength; - BYTE result; - UINT16 li; - UINT32 calledConnectId; + size_t length = 0; + UINT16 tlength = 0; + BYTE result = 0; + UINT16 li = 0; + UINT32 calledConnectId = 0; if (!mcs || !s) return FALSE; @@ -940,11 +939,11 @@ BOOL mcs_recv_connect_response(rdpMcs* mcs, wStream* s) BOOL mcs_send_connect_response(rdpMcs* mcs) { - size_t length; + size_t length = 0; int status = -1; wStream* s = NULL; - size_t bm; - size_t em; + size_t bm = 0; + size_t em = 0; wStream* gcc_CCrsp = NULL; wStream* server_data = NULL; @@ -1015,9 +1014,9 @@ out: BOOL mcs_recv_erect_domain_request(rdpMcs* mcs, wStream* s) { - UINT16 length; - UINT32 subHeight; - UINT32 subInterval; + UINT16 length = 0; + UINT32 subHeight = 0; + UINT32 subInterval = 0; WINPR_ASSERT(mcs); WINPR_ASSERT(s); @@ -1042,8 +1041,8 @@ BOOL mcs_recv_erect_domain_request(rdpMcs* mcs, wStream* s) BOOL mcs_send_erect_domain_request(rdpMcs* mcs) { - wStream* s; - int status; + wStream* s = NULL; + int status = 0; UINT16 length = 12; if (!mcs) @@ -1075,7 +1074,7 @@ BOOL mcs_send_erect_domain_request(rdpMcs* mcs) BOOL mcs_recv_attach_user_request(rdpMcs* mcs, wStream* s) { - UINT16 length; + UINT16 length = 0; if (!mcs || !s) return FALSE; @@ -1093,8 +1092,8 @@ BOOL mcs_recv_attach_user_request(rdpMcs* mcs, wStream* s) BOOL mcs_send_attach_user_request(rdpMcs* mcs) { - wStream* s; - int status; + wStream* s = NULL; + int status = 0; UINT16 length = 8; if (!mcs) @@ -1123,8 +1122,8 @@ BOOL mcs_send_attach_user_request(rdpMcs* mcs) BOOL mcs_recv_attach_user_confirm(rdpMcs* mcs, wStream* s) { - BYTE result; - UINT16 length; + BYTE result = 0; + UINT16 length = 0; if (!mcs || !s) return FALSE; @@ -1146,8 +1145,8 @@ BOOL mcs_recv_attach_user_confirm(rdpMcs* mcs, wStream* s) BOOL mcs_send_attach_user_confirm(rdpMcs* mcs) { - wStream* s; - int status; + wStream* s = NULL; + int status = 0; UINT16 length = 11; if (!mcs) @@ -1181,8 +1180,8 @@ BOOL mcs_send_attach_user_confirm(rdpMcs* mcs) BOOL mcs_recv_channel_join_request(rdpMcs* mcs, const rdpSettings* settings, wStream* s, UINT16* channelId) { - UINT16 length; - UINT16 userId; + UINT16 length = 0; + UINT16 userId = 0; if (!mcs || !s || !channelId) return FALSE; @@ -1217,8 +1216,8 @@ BOOL mcs_recv_channel_join_request(rdpMcs* mcs, const rdpSettings* settings, wSt BOOL mcs_send_channel_join_request(rdpMcs* mcs, UINT16 channelId) { - wStream* s; - int status; + wStream* s = NULL; + int status = 0; UINT16 length = 12; WINPR_ASSERT(mcs); @@ -1248,10 +1247,10 @@ BOOL mcs_send_channel_join_request(rdpMcs* mcs, UINT16 channelId) BOOL mcs_recv_channel_join_confirm(rdpMcs* mcs, wStream* s, UINT16* channelId) { - UINT16 length; - BYTE result; - UINT16 initiator; - UINT16 requested; + UINT16 length = 0; + BYTE result = 0; + UINT16 initiator = 0; + UINT16 requested = 0; WINPR_ASSERT(mcs); WINPR_ASSERT(channelId); @@ -1278,7 +1277,7 @@ BOOL mcs_recv_channel_join_confirm(rdpMcs* mcs, wStream* s, UINT16* channelId) BOOL mcs_send_channel_join_confirm(rdpMcs* mcs, UINT16 channelId) { - wStream* s; + wStream* s = NULL; int status = -1; UINT16 length = 15; @@ -1317,8 +1316,8 @@ fail: BOOL mcs_recv_disconnect_provider_ultimatum(rdpMcs* mcs, wStream* s, int* reason) { - BYTE b1; - BYTE b2; + BYTE b1 = 0; + BYTE b2 = 0; WINPR_ASSERT(mcs); WINPR_ASSERT(s); @@ -1392,7 +1391,7 @@ fail: BOOL mcs_client_begin(rdpMcs* mcs) { - rdpContext* context; + rdpContext* context = NULL; if (!mcs || !mcs->transport) return FALSE; @@ -1422,7 +1421,7 @@ BOOL mcs_client_begin(rdpMcs* mcs) rdpMcs* mcs_new(rdpTransport* transport) { - rdpMcs* mcs; + rdpMcs* mcs = NULL; mcs = (rdpMcs*)calloc(1, sizeof(rdpMcs)); diff --git a/libfreerdp/core/message.c b/libfreerdp/core/message.c index d73cf7fec..bc00d7b87 100644 --- a/libfreerdp/core/message.c +++ b/libfreerdp/core/message.c @@ -47,7 +47,7 @@ static BOOL update_message_BeginPaint(rdpContext* context) { - rdp_update_internal* up; + rdp_update_internal* up = NULL; if (!context || !context->update) return FALSE; @@ -59,7 +59,7 @@ static BOOL update_message_BeginPaint(rdpContext* context) static BOOL update_message_EndPaint(rdpContext* context) { - rdp_update_internal* up; + rdp_update_internal* up = NULL; if (!context || !context->update) return FALSE; @@ -72,7 +72,7 @@ static BOOL update_message_EndPaint(rdpContext* context) static BOOL update_message_SetBounds(rdpContext* context, const rdpBounds* bounds) { rdpBounds* wParam = NULL; - rdp_update_internal* up; + rdp_update_internal* up = NULL; if (!context || !context->update) return FALSE; @@ -94,7 +94,7 @@ static BOOL update_message_SetBounds(rdpContext* context, const rdpBounds* bound static BOOL update_message_Synchronize(rdpContext* context) { - rdp_update_internal* up; + rdp_update_internal* up = NULL; if (!context || !context->update) return FALSE; @@ -106,7 +106,7 @@ static BOOL update_message_Synchronize(rdpContext* context) static BOOL update_message_DesktopResize(rdpContext* context) { - rdp_update_internal* up; + rdp_update_internal* up = NULL; if (!context || !context->update) return FALSE; @@ -118,8 +118,8 @@ static BOOL update_message_DesktopResize(rdpContext* context) static BOOL update_message_BitmapUpdate(rdpContext* context, const BITMAP_UPDATE* bitmap) { - BITMAP_UPDATE* wParam; - rdp_update_internal* up; + BITMAP_UPDATE* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !bitmap) return FALSE; @@ -136,8 +136,8 @@ static BOOL update_message_BitmapUpdate(rdpContext* context, const BITMAP_UPDATE static BOOL update_message_Palette(rdpContext* context, const PALETTE_UPDATE* palette) { - PALETTE_UPDATE* wParam; - rdp_update_internal* up; + PALETTE_UPDATE* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !palette) return FALSE; @@ -154,8 +154,8 @@ static BOOL update_message_Palette(rdpContext* context, const PALETTE_UPDATE* pa static BOOL update_message_PlaySound(rdpContext* context, const PLAY_SOUND_UPDATE* playSound) { - PLAY_SOUND_UPDATE* wParam; - rdp_update_internal* up; + PLAY_SOUND_UPDATE* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !playSound) return FALSE; @@ -174,7 +174,7 @@ static BOOL update_message_PlaySound(rdpContext* context, const PLAY_SOUND_UPDAT static BOOL update_message_SetKeyboardIndicators(rdpContext* context, UINT16 led_flags) { - rdp_update_internal* up; + rdp_update_internal* up = NULL; if (!context || !context->update) return FALSE; @@ -188,7 +188,7 @@ static BOOL update_message_SetKeyboardIndicators(rdpContext* context, UINT16 led static BOOL update_message_SetKeyboardImeStatus(rdpContext* context, UINT16 imeId, UINT32 imeState, UINT32 imeConvMode) { - rdp_update_internal* up; + rdp_update_internal* up = NULL; if (!context || !context->update) return FALSE; @@ -201,8 +201,8 @@ static BOOL update_message_SetKeyboardImeStatus(rdpContext* context, UINT16 imeI static BOOL update_message_RefreshRect(rdpContext* context, BYTE count, const RECTANGLE_16* areas) { - RECTANGLE_16* lParam; - rdp_update_internal* up; + RECTANGLE_16* lParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !areas) return FALSE; @@ -222,7 +222,7 @@ static BOOL update_message_RefreshRect(rdpContext* context, BYTE count, const RE static BOOL update_message_SuppressOutput(rdpContext* context, BYTE allow, const RECTANGLE_16* area) { RECTANGLE_16* lParam = NULL; - rdp_update_internal* up; + rdp_update_internal* up = NULL; if (!context || !context->update) return FALSE; @@ -244,8 +244,8 @@ static BOOL update_message_SuppressOutput(rdpContext* context, BYTE allow, const static BOOL update_message_SurfaceCommand(rdpContext* context, wStream* s) { - wStream* wParam; - rdp_update_internal* up; + wStream* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !s) return FALSE; @@ -266,8 +266,8 @@ static BOOL update_message_SurfaceCommand(rdpContext* context, wStream* s) static BOOL update_message_SurfaceBits(rdpContext* context, const SURFACE_BITS_COMMAND* surfaceBitsCommand) { - SURFACE_BITS_COMMAND* wParam; - rdp_update_internal* up; + SURFACE_BITS_COMMAND* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !surfaceBitsCommand) return FALSE; @@ -285,8 +285,8 @@ static BOOL update_message_SurfaceBits(rdpContext* context, static BOOL update_message_SurfaceFrameMarker(rdpContext* context, const SURFACE_FRAME_MARKER* surfaceFrameMarker) { - SURFACE_FRAME_MARKER* wParam; - rdp_update_internal* up; + SURFACE_FRAME_MARKER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !surfaceFrameMarker) return FALSE; @@ -305,7 +305,7 @@ static BOOL update_message_SurfaceFrameMarker(rdpContext* context, static BOOL update_message_SurfaceFrameAcknowledge(rdpContext* context, UINT32 frameId) { - rdp_update_internal* up; + rdp_update_internal* up = NULL; if (!context || !context->update) return FALSE; @@ -320,8 +320,8 @@ static BOOL update_message_SurfaceFrameAcknowledge(rdpContext* context, UINT32 f static BOOL update_message_DstBlt(rdpContext* context, const DSTBLT_ORDER* dstBlt) { - DSTBLT_ORDER* wParam; - rdp_update_internal* up; + DSTBLT_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !dstBlt) return FALSE; @@ -340,8 +340,8 @@ static BOOL update_message_DstBlt(rdpContext* context, const DSTBLT_ORDER* dstBl static BOOL update_message_PatBlt(rdpContext* context, PATBLT_ORDER* patBlt) { - PATBLT_ORDER* wParam; - rdp_update_internal* up; + PATBLT_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !patBlt) return FALSE; @@ -361,8 +361,8 @@ static BOOL update_message_PatBlt(rdpContext* context, PATBLT_ORDER* patBlt) static BOOL update_message_ScrBlt(rdpContext* context, const SCRBLT_ORDER* scrBlt) { - SCRBLT_ORDER* wParam; - rdp_update_internal* up; + SCRBLT_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !scrBlt) return FALSE; @@ -381,8 +381,8 @@ static BOOL update_message_ScrBlt(rdpContext* context, const SCRBLT_ORDER* scrBl static BOOL update_message_OpaqueRect(rdpContext* context, const OPAQUE_RECT_ORDER* opaqueRect) { - OPAQUE_RECT_ORDER* wParam; - rdp_update_internal* up; + OPAQUE_RECT_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !opaqueRect) return FALSE; @@ -402,8 +402,8 @@ static BOOL update_message_OpaqueRect(rdpContext* context, const OPAQUE_RECT_ORD static BOOL update_message_DrawNineGrid(rdpContext* context, const DRAW_NINE_GRID_ORDER* drawNineGrid) { - DRAW_NINE_GRID_ORDER* wParam; - rdp_update_internal* up; + DRAW_NINE_GRID_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !drawNineGrid) return FALSE; @@ -422,8 +422,8 @@ static BOOL update_message_DrawNineGrid(rdpContext* context, static BOOL update_message_MultiDstBlt(rdpContext* context, const MULTI_DSTBLT_ORDER* multiDstBlt) { - MULTI_DSTBLT_ORDER* wParam; - rdp_update_internal* up; + MULTI_DSTBLT_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !multiDstBlt) return FALSE; @@ -442,8 +442,8 @@ static BOOL update_message_MultiDstBlt(rdpContext* context, const MULTI_DSTBLT_O static BOOL update_message_MultiPatBlt(rdpContext* context, const MULTI_PATBLT_ORDER* multiPatBlt) { - MULTI_PATBLT_ORDER* wParam; - rdp_update_internal* up; + MULTI_PATBLT_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !multiPatBlt) return FALSE; @@ -463,8 +463,8 @@ static BOOL update_message_MultiPatBlt(rdpContext* context, const MULTI_PATBLT_O static BOOL update_message_MultiScrBlt(rdpContext* context, const MULTI_SCRBLT_ORDER* multiScrBlt) { - MULTI_SCRBLT_ORDER* wParam; - rdp_update_internal* up; + MULTI_SCRBLT_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !multiScrBlt) return FALSE; @@ -484,8 +484,8 @@ static BOOL update_message_MultiScrBlt(rdpContext* context, const MULTI_SCRBLT_O static BOOL update_message_MultiOpaqueRect(rdpContext* context, const MULTI_OPAQUE_RECT_ORDER* multiOpaqueRect) { - MULTI_OPAQUE_RECT_ORDER* wParam; - rdp_update_internal* up; + MULTI_OPAQUE_RECT_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !multiOpaqueRect) return FALSE; @@ -505,8 +505,8 @@ static BOOL update_message_MultiOpaqueRect(rdpContext* context, static BOOL update_message_MultiDrawNineGrid(rdpContext* context, const MULTI_DRAW_NINE_GRID_ORDER* multiDrawNineGrid) { - MULTI_DRAW_NINE_GRID_ORDER* wParam; - rdp_update_internal* up; + MULTI_DRAW_NINE_GRID_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !multiDrawNineGrid) return FALSE; @@ -526,8 +526,8 @@ static BOOL update_message_MultiDrawNineGrid(rdpContext* context, static BOOL update_message_LineTo(rdpContext* context, const LINE_TO_ORDER* lineTo) { - LINE_TO_ORDER* wParam; - rdp_update_internal* up; + LINE_TO_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !lineTo) return FALSE; @@ -546,8 +546,8 @@ static BOOL update_message_LineTo(rdpContext* context, const LINE_TO_ORDER* line static BOOL update_message_Polyline(rdpContext* context, const POLYLINE_ORDER* polyline) { - POLYLINE_ORDER* wParam; - rdp_update_internal* up; + POLYLINE_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !polyline) return FALSE; @@ -575,8 +575,8 @@ static BOOL update_message_Polyline(rdpContext* context, const POLYLINE_ORDER* p static BOOL update_message_MemBlt(rdpContext* context, MEMBLT_ORDER* memBlt) { - MEMBLT_ORDER* wParam; - rdp_update_internal* up; + MEMBLT_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !memBlt) return FALSE; @@ -595,8 +595,8 @@ static BOOL update_message_MemBlt(rdpContext* context, MEMBLT_ORDER* memBlt) static BOOL update_message_Mem3Blt(rdpContext* context, MEM3BLT_ORDER* mem3Blt) { - MEM3BLT_ORDER* wParam; - rdp_update_internal* up; + MEM3BLT_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !mem3Blt) return FALSE; @@ -616,8 +616,8 @@ static BOOL update_message_Mem3Blt(rdpContext* context, MEM3BLT_ORDER* mem3Blt) static BOOL update_message_SaveBitmap(rdpContext* context, const SAVE_BITMAP_ORDER* saveBitmap) { - SAVE_BITMAP_ORDER* wParam; - rdp_update_internal* up; + SAVE_BITMAP_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !saveBitmap) return FALSE; @@ -636,8 +636,8 @@ static BOOL update_message_SaveBitmap(rdpContext* context, const SAVE_BITMAP_ORD static BOOL update_message_GlyphIndex(rdpContext* context, GLYPH_INDEX_ORDER* glyphIndex) { - GLYPH_INDEX_ORDER* wParam; - rdp_update_internal* up; + GLYPH_INDEX_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !glyphIndex) return FALSE; @@ -657,8 +657,8 @@ static BOOL update_message_GlyphIndex(rdpContext* context, GLYPH_INDEX_ORDER* gl static BOOL update_message_FastIndex(rdpContext* context, const FAST_INDEX_ORDER* fastIndex) { - FAST_INDEX_ORDER* wParam; - rdp_update_internal* up; + FAST_INDEX_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !fastIndex) return FALSE; @@ -677,8 +677,8 @@ static BOOL update_message_FastIndex(rdpContext* context, const FAST_INDEX_ORDER static BOOL update_message_FastGlyph(rdpContext* context, const FAST_GLYPH_ORDER* fastGlyph) { - FAST_GLYPH_ORDER* wParam; - rdp_update_internal* up; + FAST_GLYPH_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !fastGlyph) return FALSE; @@ -714,8 +714,8 @@ static BOOL update_message_FastGlyph(rdpContext* context, const FAST_GLYPH_ORDER static BOOL update_message_PolygonSC(rdpContext* context, const POLYGON_SC_ORDER* polygonSC) { - POLYGON_SC_ORDER* wParam; - rdp_update_internal* up; + POLYGON_SC_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !polygonSC) return FALSE; @@ -743,8 +743,8 @@ static BOOL update_message_PolygonSC(rdpContext* context, const POLYGON_SC_ORDER static BOOL update_message_PolygonCB(rdpContext* context, POLYGON_CB_ORDER* polygonCB) { - POLYGON_CB_ORDER* wParam; - rdp_update_internal* up; + POLYGON_CB_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !polygonCB) return FALSE; @@ -773,8 +773,8 @@ static BOOL update_message_PolygonCB(rdpContext* context, POLYGON_CB_ORDER* poly static BOOL update_message_EllipseSC(rdpContext* context, const ELLIPSE_SC_ORDER* ellipseSC) { - ELLIPSE_SC_ORDER* wParam; - rdp_update_internal* up; + ELLIPSE_SC_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !ellipseSC) return FALSE; @@ -793,8 +793,8 @@ static BOOL update_message_EllipseSC(rdpContext* context, const ELLIPSE_SC_ORDER static BOOL update_message_EllipseCB(rdpContext* context, const ELLIPSE_CB_ORDER* ellipseCB) { - ELLIPSE_CB_ORDER* wParam; - rdp_update_internal* up; + ELLIPSE_CB_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !ellipseCB) return FALSE; @@ -817,8 +817,8 @@ static BOOL update_message_EllipseCB(rdpContext* context, const ELLIPSE_CB_ORDER static BOOL update_message_CacheBitmap(rdpContext* context, const CACHE_BITMAP_ORDER* cacheBitmapOrder) { - CACHE_BITMAP_ORDER* wParam; - rdp_update_internal* up; + CACHE_BITMAP_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !cacheBitmapOrder) return FALSE; @@ -836,8 +836,8 @@ static BOOL update_message_CacheBitmap(rdpContext* context, static BOOL update_message_CacheBitmapV2(rdpContext* context, CACHE_BITMAP_V2_ORDER* cacheBitmapV2Order) { - CACHE_BITMAP_V2_ORDER* wParam; - rdp_update_internal* up; + CACHE_BITMAP_V2_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !cacheBitmapV2Order) return FALSE; @@ -855,8 +855,8 @@ static BOOL update_message_CacheBitmapV2(rdpContext* context, static BOOL update_message_CacheBitmapV3(rdpContext* context, CACHE_BITMAP_V3_ORDER* cacheBitmapV3Order) { - CACHE_BITMAP_V3_ORDER* wParam; - rdp_update_internal* up; + CACHE_BITMAP_V3_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !cacheBitmapV3Order) return FALSE; @@ -874,8 +874,8 @@ static BOOL update_message_CacheBitmapV3(rdpContext* context, static BOOL update_message_CacheColorTable(rdpContext* context, const CACHE_COLOR_TABLE_ORDER* cacheColorTableOrder) { - CACHE_COLOR_TABLE_ORDER* wParam; - rdp_update_internal* up; + CACHE_COLOR_TABLE_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !cacheColorTableOrder) return FALSE; @@ -892,8 +892,8 @@ static BOOL update_message_CacheColorTable(rdpContext* context, static BOOL update_message_CacheGlyph(rdpContext* context, const CACHE_GLYPH_ORDER* cacheGlyphOrder) { - CACHE_GLYPH_ORDER* wParam; - rdp_update_internal* up; + CACHE_GLYPH_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !cacheGlyphOrder) return FALSE; @@ -911,8 +911,8 @@ static BOOL update_message_CacheGlyph(rdpContext* context, const CACHE_GLYPH_ORD static BOOL update_message_CacheGlyphV2(rdpContext* context, const CACHE_GLYPH_V2_ORDER* cacheGlyphV2Order) { - CACHE_GLYPH_V2_ORDER* wParam; - rdp_update_internal* up; + CACHE_GLYPH_V2_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !cacheGlyphV2Order) return FALSE; @@ -929,8 +929,8 @@ static BOOL update_message_CacheGlyphV2(rdpContext* context, static BOOL update_message_CacheBrush(rdpContext* context, const CACHE_BRUSH_ORDER* cacheBrushOrder) { - CACHE_BRUSH_ORDER* wParam; - rdp_update_internal* up; + CACHE_BRUSH_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !cacheBrushOrder) return FALSE; @@ -951,8 +951,8 @@ static BOOL update_message_CreateOffscreenBitmap(rdpContext* context, const CREATE_OFFSCREEN_BITMAP_ORDER* createOffscreenBitmap) { - CREATE_OFFSCREEN_BITMAP_ORDER* wParam; - rdp_update_internal* up; + CREATE_OFFSCREEN_BITMAP_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !createOffscreenBitmap) return FALSE; @@ -985,8 +985,8 @@ update_message_CreateOffscreenBitmap(rdpContext* context, static BOOL update_message_SwitchSurface(rdpContext* context, const SWITCH_SURFACE_ORDER* switchSurface) { - SWITCH_SURFACE_ORDER* wParam; - rdp_update_internal* up; + SWITCH_SURFACE_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !switchSurface) return FALSE; @@ -1007,8 +1007,8 @@ static BOOL update_message_CreateNineGridBitmap(rdpContext* context, const CREATE_NINE_GRID_BITMAP_ORDER* createNineGridBitmap) { - CREATE_NINE_GRID_BITMAP_ORDER* wParam; - rdp_update_internal* up; + CREATE_NINE_GRID_BITMAP_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !createNineGridBitmap) return FALSE; @@ -1028,8 +1028,8 @@ update_message_CreateNineGridBitmap(rdpContext* context, static BOOL update_message_FrameMarker(rdpContext* context, const FRAME_MARKER_ORDER* frameMarker) { - FRAME_MARKER_ORDER* wParam; - rdp_update_internal* up; + FRAME_MARKER_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !frameMarker) return FALSE; @@ -1049,8 +1049,8 @@ static BOOL update_message_FrameMarker(rdpContext* context, const FRAME_MARKER_O static BOOL update_message_StreamBitmapFirst(rdpContext* context, const STREAM_BITMAP_FIRST_ORDER* streamBitmapFirst) { - STREAM_BITMAP_FIRST_ORDER* wParam; - rdp_update_internal* up; + STREAM_BITMAP_FIRST_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !streamBitmapFirst) return FALSE; @@ -1071,8 +1071,8 @@ static BOOL update_message_StreamBitmapFirst(rdpContext* context, static BOOL update_message_StreamBitmapNext(rdpContext* context, const STREAM_BITMAP_NEXT_ORDER* streamBitmapNext) { - STREAM_BITMAP_NEXT_ORDER* wParam; - rdp_update_internal* up; + STREAM_BITMAP_NEXT_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !streamBitmapNext) return FALSE; @@ -1093,8 +1093,8 @@ static BOOL update_message_StreamBitmapNext(rdpContext* context, static BOOL update_message_DrawGdiPlusFirst(rdpContext* context, const DRAW_GDIPLUS_FIRST_ORDER* drawGdiPlusFirst) { - DRAW_GDIPLUS_FIRST_ORDER* wParam; - rdp_update_internal* up; + DRAW_GDIPLUS_FIRST_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !drawGdiPlusFirst) return FALSE; @@ -1114,8 +1114,8 @@ static BOOL update_message_DrawGdiPlusFirst(rdpContext* context, static BOOL update_message_DrawGdiPlusNext(rdpContext* context, const DRAW_GDIPLUS_NEXT_ORDER* drawGdiPlusNext) { - DRAW_GDIPLUS_NEXT_ORDER* wParam; - rdp_update_internal* up; + DRAW_GDIPLUS_NEXT_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !drawGdiPlusNext) return FALSE; @@ -1136,8 +1136,8 @@ static BOOL update_message_DrawGdiPlusNext(rdpContext* context, static BOOL update_message_DrawGdiPlusEnd(rdpContext* context, const DRAW_GDIPLUS_END_ORDER* drawGdiPlusEnd) { - DRAW_GDIPLUS_END_ORDER* wParam; - rdp_update_internal* up; + DRAW_GDIPLUS_END_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !drawGdiPlusEnd) return FALSE; @@ -1159,8 +1159,8 @@ static BOOL update_message_DrawGdiPlusCacheFirst(rdpContext* context, const DRAW_GDIPLUS_CACHE_FIRST_ORDER* drawGdiPlusCacheFirst) { - DRAW_GDIPLUS_CACHE_FIRST_ORDER* wParam; - rdp_update_internal* up; + DRAW_GDIPLUS_CACHE_FIRST_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !drawGdiPlusCacheFirst) return FALSE; @@ -1183,8 +1183,8 @@ static BOOL update_message_DrawGdiPlusCacheNext(rdpContext* context, const DRAW_GDIPLUS_CACHE_NEXT_ORDER* drawGdiPlusCacheNext) { - DRAW_GDIPLUS_CACHE_NEXT_ORDER* wParam; - rdp_update_internal* up; + DRAW_GDIPLUS_CACHE_NEXT_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !drawGdiPlusCacheNext) return FALSE; @@ -1207,8 +1207,8 @@ static BOOL update_message_DrawGdiPlusCacheEnd(rdpContext* context, const DRAW_GDIPLUS_CACHE_END_ORDER* drawGdiPlusCacheEnd) { - DRAW_GDIPLUS_CACHE_END_ORDER* wParam; - rdp_update_internal* up; + DRAW_GDIPLUS_CACHE_END_ORDER* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !drawGdiPlusCacheEnd) return FALSE; @@ -1231,9 +1231,9 @@ update_message_DrawGdiPlusCacheEnd(rdpContext* context, static BOOL update_message_WindowCreate(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_STATE_ORDER* windowState) { - WINDOW_ORDER_INFO* wParam; - WINDOW_STATE_ORDER* lParam; - rdp_update_internal* up; + WINDOW_ORDER_INFO* wParam = NULL; + WINDOW_STATE_ORDER* lParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !orderInfo || !windowState) return FALSE; @@ -1262,9 +1262,9 @@ static BOOL update_message_WindowCreate(rdpContext* context, const WINDOW_ORDER_ static BOOL update_message_WindowUpdate(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_STATE_ORDER* windowState) { - WINDOW_ORDER_INFO* wParam; - WINDOW_STATE_ORDER* lParam; - rdp_update_internal* up; + WINDOW_ORDER_INFO* wParam = NULL; + WINDOW_STATE_ORDER* lParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !orderInfo || !windowState) return FALSE; @@ -1293,9 +1293,9 @@ static BOOL update_message_WindowUpdate(rdpContext* context, const WINDOW_ORDER_ static BOOL update_message_WindowIcon(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_ICON_ORDER* windowIcon) { - WINDOW_ORDER_INFO* wParam; - WINDOW_ICON_ORDER* lParam; - rdp_update_internal* up; + WINDOW_ORDER_INFO* wParam = NULL; + WINDOW_ICON_ORDER* lParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !orderInfo || !windowIcon) return FALSE; @@ -1373,9 +1373,9 @@ out_fail: static BOOL update_message_WindowCachedIcon(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_CACHED_ICON_ORDER* windowCachedIcon) { - WINDOW_ORDER_INFO* wParam; - WINDOW_CACHED_ICON_ORDER* lParam; - rdp_update_internal* up; + WINDOW_ORDER_INFO* wParam = NULL; + WINDOW_CACHED_ICON_ORDER* lParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !orderInfo || !windowCachedIcon) return FALSE; @@ -1404,8 +1404,8 @@ static BOOL update_message_WindowCachedIcon(rdpContext* context, const WINDOW_OR static BOOL update_message_WindowDelete(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo) { - WINDOW_ORDER_INFO* wParam; - rdp_update_internal* up; + WINDOW_ORDER_INFO* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !orderInfo) return FALSE; @@ -1425,9 +1425,9 @@ static BOOL update_message_WindowDelete(rdpContext* context, const WINDOW_ORDER_ static BOOL update_message_NotifyIconCreate(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const NOTIFY_ICON_STATE_ORDER* notifyIconState) { - WINDOW_ORDER_INFO* wParam; - NOTIFY_ICON_STATE_ORDER* lParam; - rdp_update_internal* up; + WINDOW_ORDER_INFO* wParam = NULL; + NOTIFY_ICON_STATE_ORDER* lParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !orderInfo || !notifyIconState) return FALSE; @@ -1457,9 +1457,9 @@ static BOOL update_message_NotifyIconCreate(rdpContext* context, const WINDOW_OR static BOOL update_message_NotifyIconUpdate(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const NOTIFY_ICON_STATE_ORDER* notifyIconState) { - WINDOW_ORDER_INFO* wParam; - NOTIFY_ICON_STATE_ORDER* lParam; - rdp_update_internal* up; + WINDOW_ORDER_INFO* wParam = NULL; + NOTIFY_ICON_STATE_ORDER* lParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !orderInfo || !notifyIconState) return FALSE; @@ -1488,8 +1488,8 @@ static BOOL update_message_NotifyIconUpdate(rdpContext* context, const WINDOW_OR static BOOL update_message_NotifyIconDelete(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo) { - WINDOW_ORDER_INFO* wParam; - rdp_update_internal* up; + WINDOW_ORDER_INFO* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !orderInfo) return FALSE; @@ -1509,9 +1509,9 @@ static BOOL update_message_NotifyIconDelete(rdpContext* context, const WINDOW_OR static BOOL update_message_MonitoredDesktop(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const MONITORED_DESKTOP_ORDER* monitoredDesktop) { - WINDOW_ORDER_INFO* wParam; - MONITORED_DESKTOP_ORDER* lParam; - rdp_update_internal* up; + WINDOW_ORDER_INFO* wParam = NULL; + MONITORED_DESKTOP_ORDER* lParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !orderInfo || !monitoredDesktop) return FALSE; @@ -1548,8 +1548,8 @@ static BOOL update_message_MonitoredDesktop(rdpContext* context, const WINDOW_OR static BOOL update_message_NonMonitoredDesktop(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo) { - WINDOW_ORDER_INFO* wParam; - rdp_update_internal* up; + WINDOW_ORDER_INFO* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !orderInfo) return FALSE; @@ -1571,8 +1571,8 @@ static BOOL update_message_NonMonitoredDesktop(rdpContext* context, static BOOL update_message_PointerPosition(rdpContext* context, const POINTER_POSITION_UPDATE* pointerPosition) { - POINTER_POSITION_UPDATE* wParam; - rdp_update_internal* up; + POINTER_POSITION_UPDATE* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !pointerPosition) return FALSE; @@ -1590,8 +1590,8 @@ static BOOL update_message_PointerPosition(rdpContext* context, static BOOL update_message_PointerSystem(rdpContext* context, const POINTER_SYSTEM_UPDATE* pointerSystem) { - POINTER_SYSTEM_UPDATE* wParam; - rdp_update_internal* up; + POINTER_SYSTEM_UPDATE* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !pointerSystem) return FALSE; @@ -1609,8 +1609,8 @@ static BOOL update_message_PointerSystem(rdpContext* context, static BOOL update_message_PointerColor(rdpContext* context, const POINTER_COLOR_UPDATE* pointerColor) { - POINTER_COLOR_UPDATE* wParam; - rdp_update_internal* up; + POINTER_COLOR_UPDATE* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !pointerColor) return FALSE; @@ -1627,8 +1627,8 @@ static BOOL update_message_PointerColor(rdpContext* context, static BOOL update_message_PointerLarge(rdpContext* context, const POINTER_LARGE_UPDATE* pointer) { - POINTER_LARGE_UPDATE* wParam; - rdp_update_internal* up; + POINTER_LARGE_UPDATE* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !pointer) return FALSE; @@ -1645,8 +1645,8 @@ static BOOL update_message_PointerLarge(rdpContext* context, const POINTER_LARGE static BOOL update_message_PointerNew(rdpContext* context, const POINTER_NEW_UPDATE* pointerNew) { - POINTER_NEW_UPDATE* wParam; - rdp_update_internal* up; + POINTER_NEW_UPDATE* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !pointerNew) return FALSE; @@ -1664,8 +1664,8 @@ static BOOL update_message_PointerNew(rdpContext* context, const POINTER_NEW_UPD static BOOL update_message_PointerCached(rdpContext* context, const POINTER_CACHED_UPDATE* pointerCached) { - POINTER_CACHED_UPDATE* wParam; - rdp_update_internal* up; + POINTER_CACHED_UPDATE* wParam = NULL; + rdp_update_internal* up = NULL; if (!context || !context->update || !pointerCached) return FALSE; @@ -1683,7 +1683,7 @@ static BOOL update_message_PointerCached(rdpContext* context, /* Message Queue */ static BOOL update_message_free_update_class(wMessage* msg, int type) { - rdpContext* context; + rdpContext* context = NULL; if (!msg) return FALSE; @@ -2071,7 +2071,7 @@ static BOOL update_message_process_primary_update_class(rdpUpdateProxy* proxy, w static BOOL update_message_free_secondary_update_class(wMessage* msg, int type) { - rdpContext* context; + rdpContext* context = NULL; if (!msg) return FALSE; @@ -2452,7 +2452,7 @@ static BOOL update_message_process_window_update_class(rdpUpdateProxy* proxy, wM static BOOL update_message_free_pointer_update_class(wMessage* msg, int type) { - rdpContext* context; + rdpContext* context = NULL; if (!msg) return FALSE; @@ -2623,9 +2623,9 @@ static int update_message_process_class(rdpUpdateProxy* proxy, wMessage* msg, in int update_message_queue_process_message(rdpUpdate* update, wMessage* message) { - int status; - int msgClass; - int msgType; + int status = 0; + int msgClass = 0; + int msgType = 0; rdp_update_internal* up = update_cast(update); if (!update || !message) @@ -2647,8 +2647,8 @@ int update_message_queue_process_message(rdpUpdate* update, wMessage* message) int update_message_queue_free_message(wMessage* message) { - int msgClass; - int msgType; + int msgClass = 0; + int msgType = 0; if (!message) return -1; @@ -2682,11 +2682,11 @@ int update_message_queue_process_pending_messages(rdpUpdate* update) static BOOL update_message_register_interface(rdpUpdateProxy* message, rdpUpdate* update) { - rdpPrimaryUpdate* primary; - rdpSecondaryUpdate* secondary; - rdpAltSecUpdate* altsec; - rdpWindowUpdate* window; - rdpPointerUpdate* pointer; + rdpPrimaryUpdate* primary = NULL; + rdpSecondaryUpdate* secondary = NULL; + rdpAltSecUpdate* altsec = NULL; + rdpWindowUpdate* window = NULL; + rdpPointerUpdate* pointer = NULL; if (!message || !update) return FALSE; @@ -2975,9 +2975,9 @@ static int input_message_process_input_class(rdpInputProxy* proxy, wMessage* msg case Input_MouseEvent: { - UINT32 pos; - UINT16 x; - UINT16 y; + UINT32 pos = 0; + UINT16 x = 0; + UINT16 y = 0; pos = (UINT32)(size_t)msg->lParam; x = ((pos & 0xFFFF0000) >> 16); y = (pos & 0x0000FFFF); @@ -2987,9 +2987,9 @@ static int input_message_process_input_class(rdpInputProxy* proxy, wMessage* msg case Input_ExtendedMouseEvent: { - UINT32 pos; - UINT16 x; - UINT16 y; + UINT32 pos = 0; + UINT16 x = 0; + UINT16 y = 0; pos = (UINT32)(size_t)msg->lParam; x = ((pos & 0xFFFF0000) >> 16); y = (pos & 0x0000FFFF); @@ -3058,9 +3058,9 @@ static int input_message_process_class(rdpInputProxy* proxy, wMessage* msg, int int input_message_queue_free_message(wMessage* message) { - int status; - int msgClass; - int msgType; + int status = 0; + int msgClass = 0; + int msgType = 0; if (!message) return -1; @@ -3080,9 +3080,9 @@ int input_message_queue_free_message(wMessage* message) int input_message_queue_process_message(rdpInput* input, wMessage* message) { - int status; - int msgClass; - int msgType; + int status = 0; + int msgClass = 0; + int msgType = 0; rdp_input_internal* in = input_cast(input); if (!message) diff --git a/libfreerdp/core/metrics.c b/libfreerdp/core/metrics.c index 1d2e1f22b..a1253dec6 100644 --- a/libfreerdp/core/metrics.c +++ b/libfreerdp/core/metrics.c @@ -39,7 +39,7 @@ double metrics_write_bytes(rdpMetrics* metrics, UINT32 UncompressedBytes, UINT32 rdpMetrics* metrics_new(rdpContext* context) { - rdpMetrics* metrics; + rdpMetrics* metrics = NULL; metrics = (rdpMetrics*)calloc(1, sizeof(rdpMetrics)); diff --git a/libfreerdp/core/multitransport.c b/libfreerdp/core/multitransport.c index a7f6a6a61..f37870f7c 100644 --- a/libfreerdp/core/multitransport.c +++ b/libfreerdp/core/multitransport.c @@ -62,10 +62,10 @@ state_run_t multitransport_recv_request(rdpMultitransport* multi, wStream* s) if (!Stream_CheckAndLogRequiredLength(TAG, s, 24)) return STATE_RUN_FAILED; - UINT32 requestId; - UINT16 requestedProto; - UINT16 reserved; - const BYTE* cookie; + UINT32 requestId = 0; + UINT16 requestedProto = 0; + UINT16 reserved = 0; + const BYTE* cookie = NULL; Stream_Read_UINT32(s, requestId); /* requestId (4 bytes) */ Stream_Read_UINT16(s, requestedProto); /* requestedProtocol (2 bytes) */ @@ -172,8 +172,8 @@ state_run_t multitransport_recv_response(rdpMultitransport* multi, wStream* s) if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) return STATE_RUN_FAILED; - UINT32 requestId; - HRESULT hr; + UINT32 requestId = 0; + HRESULT hr = 0; Stream_Read_UINT32(s, requestId); /* requestId (4 bytes) */ Stream_Read_UINT32(s, hr); /* hrResponse (4 bytes) */ diff --git a/libfreerdp/core/nego.c b/libfreerdp/core/nego.c index db0fcf6e6..610f2b099 100644 --- a/libfreerdp/core/nego.c +++ b/libfreerdp/core/nego.c @@ -126,8 +126,8 @@ BOOL nego_update_settings_from_state(rdpNego* nego, rdpSettings* settings) BOOL nego_connect(rdpNego* nego) { - rdpContext* context; - rdpSettings* settings; + rdpContext* context = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(nego); context = transport_get_context(nego->transport); WINPR_ASSERT(context); @@ -353,11 +353,11 @@ BOOL nego_security_connect(rdpNego* nego) static BOOL nego_tcp_connect(rdpNego* nego) { - rdpContext* context; + rdpContext* context = NULL; WINPR_ASSERT(nego); if (!nego->TcpConnected) { - UINT32 TcpConnectTimeout; + UINT32 TcpConnectTimeout = 0; context = transport_get_context(nego->transport); WINPR_ASSERT(context); @@ -448,8 +448,8 @@ BOOL nego_transport_disconnect(rdpNego* nego) BOOL nego_send_preconnection_pdu(rdpNego* nego) { - wStream* s; - UINT32 cbSize; + wStream* s = NULL; + UINT32 cbSize = 0; UINT16 cchPCB = 0; WCHAR* wszPCB = NULL; @@ -746,8 +746,8 @@ static void nego_attempt_rdp(rdpNego* nego) BOOL nego_recv_response(rdpNego* nego) { - int status; - wStream* s; + int status = 0; + wStream* s = NULL; WINPR_ASSERT(nego); s = Stream_New(NULL, 1024); @@ -788,9 +788,9 @@ BOOL nego_recv_response(rdpNego* nego) int nego_recv(rdpTransport* transport, wStream* s, void* extra) { - BYTE li; - BYTE type; - UINT16 length; + BYTE li = 0; + BYTE type = 0; + UINT16 length = 0; rdpNego* nego = (rdpNego*)extra; WINPR_ASSERT(nego); @@ -886,7 +886,7 @@ static BOOL nego_read_request_token_or_cookie(rdpNego* nego, wStream* s) * Cookie:[space]mstshash=[ANSISTRING][\x0D\x0A] */ UINT16 crlf = 0; - size_t len; + size_t len = 0; BOOL result = FALSE; BOOL isToken = FALSE; size_t remain = Stream_GetRemainingLength(s); @@ -970,9 +970,9 @@ static BOOL nego_read_request_token_or_cookie(rdpNego* nego, wStream* s) BOOL nego_read_request(rdpNego* nego, wStream* s) { - BYTE li; - BYTE type; - UINT16 length; + BYTE li = 0; + BYTE type = 0; + UINT16 length = 0; WINPR_ASSERT(nego); WINPR_ASSERT(s); @@ -1062,12 +1062,12 @@ void nego_send(rdpNego* nego) BOOL nego_send_negotiation_request(rdpNego* nego) { BOOL rc = FALSE; - wStream* s; - size_t length; - size_t bm; - size_t em; + wStream* s = NULL; + size_t length = 0; + size_t bm = 0; + size_t em = 0; BYTE flags = 0; - size_t cookie_length; + size_t cookie_length = 0; s = Stream_New(NULL, 512); WINPR_ASSERT(nego); @@ -1153,10 +1153,10 @@ fail: static BOOL nego_process_correlation_info(rdpNego* nego, wStream* s) { - UINT8 type; - UINT8 flags; - UINT8 x; - UINT16 length; + UINT8 type = 0; + UINT8 flags = 0; + UINT8 x = 0; + UINT16 length = 0; BYTE correlationId[16] = { 0 }; if (!Stream_CheckAndLogRequiredLength(TAG, s, 36)) @@ -1218,8 +1218,8 @@ static BOOL nego_process_correlation_info(rdpNego* nego, wStream* s) BOOL nego_process_negotiation_request(rdpNego* nego, wStream* s) { - BYTE flags; - UINT16 length; + BYTE flags = 0; + UINT16 length = 0; WINPR_ASSERT(nego); WINPR_ASSERT(s); @@ -1295,7 +1295,7 @@ static const char* nego_rdp_neg_rsp_flags_str(UINT32 flags) BOOL nego_process_negotiation_response(rdpNego* nego, wStream* s) { - UINT16 length; + UINT16 length = 0; WINPR_ASSERT(nego); WINPR_ASSERT(s); @@ -1316,7 +1316,7 @@ BOOL nego_process_negotiation_response(rdpNego* nego, wStream* s) nego_set_state(nego, NEGO_STATE_FAIL); return FALSE; } - UINT32 SelectedProtocol; + UINT32 SelectedProtocol = 0; Stream_Read_UINT32(s, SelectedProtocol); if (!nego_set_selected_protocol(nego, SelectedProtocol)) @@ -1334,9 +1334,9 @@ BOOL nego_process_negotiation_response(rdpNego* nego, wStream* s) BOOL nego_process_negotiation_failure(rdpNego* nego, wStream* s) { - BYTE flags; - UINT16 length; - UINT32 failureCode; + BYTE flags = 0; + UINT16 length = 0; + UINT32 failureCode = 0; WINPR_ASSERT(nego); WINPR_ASSERT(s); @@ -1399,14 +1399,14 @@ BOOL nego_process_negotiation_failure(rdpNego* nego, wStream* s) BOOL nego_send_negotiation_response(rdpNego* nego) { - UINT16 length; - size_t bm; - size_t em; - BOOL status; - wStream* s; - BYTE flags; - rdpContext* context; - rdpSettings* settings; + UINT16 length = 0; + size_t bm = 0; + size_t em = 0; + BOOL status = 0; + wStream* s = NULL; + BYTE flags = 0; + rdpContext* context = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(nego); context = transport_get_context(nego->transport); @@ -1948,7 +1948,7 @@ BOOL nego_set_state(rdpNego* nego, NEGO_STATE state) SEC_WINNT_AUTH_IDENTITY* nego_get_identity(rdpNego* nego) { - rdpNla* nla; + rdpNla* nla = NULL; if (!nego) return NULL; diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c index f3f6e4dd5..48bb65b90 100644 --- a/libfreerdp/core/nla.c +++ b/libfreerdp/core/nla.c @@ -1231,6 +1231,7 @@ static BOOL nla_read_TSRemoteGuardPackageCred(rdpNla* nla, WinPrAsn1Decoder* dec /** @brief kind of TSCreds */ typedef enum { + TSCREDS_INVALID = 0, TSCREDS_USER_PASSWD = 1, TSCREDS_SMARTCARD = 2, TSCREDS_REMOTEGUARD = 6 @@ -1405,7 +1406,7 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla) WinPrAsn1Encoder* enc = NULL; size_t length = 0; wStream s = { 0 }; - TsCredentialsType credType; + TsCredentialsType credType = TSCREDS_INVALID; WINPR_ASSERT(nla); WINPR_ASSERT(nla->rdpcontext); diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c index f6a0773dd..97aaf5470 100644 --- a/libfreerdp/core/orders.c +++ b/libfreerdp/core/orders.c @@ -512,8 +512,8 @@ static const char* altsec_order_string(BYTE orderType) static INLINE BOOL update_read_coord(wStream* s, INT32* coord, BOOL delta) { - INT8 lsi8; - INT16 lsi16; + INT8 lsi8 = 0; + INT16 lsi16 = 0; if (delta) { @@ -541,7 +541,7 @@ static INLINE BOOL update_write_coord(wStream* s, INT32 coord) } static INLINE BOOL update_read_color(wStream* s, UINT32* color) { - BYTE byte; + BYTE byte = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 3)) return FALSE; @@ -557,7 +557,7 @@ static INLINE BOOL update_read_color(wStream* s, UINT32* color) } static INLINE BOOL update_write_color(wStream* s, UINT32 color) { - BYTE byte; + BYTE byte = 0; byte = (color & 0xFF); Stream_Write_UINT8(s, byte); byte = ((color >> 8) & 0xFF); @@ -568,7 +568,7 @@ static INLINE BOOL update_write_color(wStream* s, UINT32 color) } static INLINE BOOL update_read_colorref(wStream* s, UINT32* color) { - BYTE byte; + BYTE byte = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) return FALSE; @@ -589,7 +589,7 @@ static INLINE BOOL update_read_color_quad(wStream* s, UINT32* color) } static INLINE void update_write_color_quad(wStream* s, UINT32 color) { - BYTE byte; + BYTE byte = 0; byte = (color >> 16) & 0xFF; Stream_Write_UINT8(s, byte); byte = (color >> 8) & 0xFF; @@ -599,7 +599,7 @@ static INLINE void update_write_color_quad(wStream* s, UINT32 color) } static INLINE BOOL update_read_2byte_unsigned(wStream* s, UINT32* value) { - BYTE byte; + BYTE byte = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -624,7 +624,7 @@ static INLINE BOOL update_read_2byte_unsigned(wStream* s, UINT32* value) } static INLINE BOOL update_write_2byte_unsigned(wStream* s, UINT32 value) { - BYTE byte; + BYTE byte = 0; if (value > 0x7FFF) return FALSE; @@ -646,8 +646,8 @@ static INLINE BOOL update_write_2byte_unsigned(wStream* s, UINT32 value) } static INLINE BOOL update_read_2byte_signed(wStream* s, INT32* value) { - BYTE byte; - BOOL negative; + BYTE byte = 0; + BOOL negative = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -672,7 +672,7 @@ static INLINE BOOL update_read_2byte_signed(wStream* s, INT32* value) } static INLINE BOOL update_write_2byte_signed(wStream* s, INT32 value) { - BYTE byte; + BYTE byte = 0; BOOL negative = FALSE; if (value < 0) @@ -709,8 +709,8 @@ static INLINE BOOL update_write_2byte_signed(wStream* s, INT32 value) } static INLINE BOOL update_read_4byte_unsigned(wStream* s, UINT32* value) { - BYTE byte; - BYTE count; + BYTE byte = 0; + BYTE count = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -759,7 +759,7 @@ static INLINE BOOL update_read_4byte_unsigned(wStream* s, UINT32* value) } static INLINE BOOL update_write_4byte_unsigned(wStream* s, UINT32 value) { - BYTE byte; + BYTE byte = 0; if (value <= 0x3F) { @@ -799,7 +799,7 @@ static INLINE BOOL update_write_4byte_unsigned(wStream* s, UINT32 value) } static INLINE BOOL update_read_delta(wStream* s, INT32* value) { - BYTE byte; + BYTE byte = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -878,7 +878,7 @@ static INLINE BOOL update_read_brush(wStream* s, rdpBrush* brush, BYTE fieldFlag if (brush->style & CACHED_BRUSH) { - BOOL rc; + BOOL rc = 0; brush->index = brush->hatch; brush->bpp = get_bmf_bpp(brush->style, &rc); if (!rc) @@ -924,7 +924,7 @@ static INLINE BOOL update_write_brush(wStream* s, rdpBrush* brush, BYTE fieldFla if (brush->style & CACHED_BRUSH) { - BOOL rc; + BOOL rc = 0; brush->hatch = brush->index; brush->bpp = get_bmf_bpp(brush->style, &rc); if (!rc) @@ -956,10 +956,10 @@ static INLINE BOOL update_write_brush(wStream* s, rdpBrush* brush, BYTE fieldFla static INLINE BOOL update_read_delta_rects(wStream* s, DELTA_RECT* rectangles, UINT32* nr) { UINT32 number = *nr; - UINT32 i; + UINT32 i = 0; BYTE flags = 0; - BYTE* zeroBits; - UINT32 zeroBitsSize; + BYTE* zeroBits = NULL; + UINT32 zeroBitsSize = 0; if (number > 45) { @@ -1023,7 +1023,7 @@ static INLINE BOOL update_read_delta_points(wStream* s, DELTA_POINT** points, UI INT16 x, INT16 y) { BYTE flags = 0; - BYTE* zeroBits; + BYTE* zeroBits = NULL; UINT32 zeroBitsSize = ((number + 3) / 4); WINPR_ASSERT(points); @@ -1360,7 +1360,7 @@ static BOOL update_read_opaque_rect_order(const char* orderName, wStream* s, const ORDER_INFO* orderInfo, OPAQUE_RECT_ORDER* opaque_rect) { - BYTE byte; + BYTE byte = 0; if (!read_order_field_coord(orderName, orderInfo, s, 1, &opaque_rect->nLeftRect, FALSE) || !read_order_field_coord(orderName, orderInfo, s, 2, &opaque_rect->nTopRect, FALSE) || !read_order_field_coord(orderName, orderInfo, s, 3, &opaque_rect->nWidth, FALSE) || @@ -1408,7 +1408,7 @@ size_t update_approximate_opaque_rect_order(ORDER_INFO* orderInfo, BOOL update_write_opaque_rect_order(wStream* s, ORDER_INFO* orderInfo, const OPAQUE_RECT_ORDER* opaque_rect) { - BYTE byte; + BYTE byte = 0; size_t inf = update_approximate_opaque_rect_order(orderInfo, opaque_rect); if (!Stream_EnsureRemainingCapacity(s, inf)) @@ -1567,7 +1567,7 @@ static BOOL update_read_multi_opaque_rect_order(const char* orderName, wStream* const ORDER_INFO* orderInfo, MULTI_OPAQUE_RECT_ORDER* multi_opaque_rect) { - BYTE byte; + BYTE byte = 0; if (!read_order_field_coord(orderName, orderInfo, s, 1, &multi_opaque_rect->nLeftRect, FALSE) || !read_order_field_coord(orderName, orderInfo, s, 2, &multi_opaque_rect->nTopRect, FALSE) || !read_order_field_coord(orderName, orderInfo, s, 3, &multi_opaque_rect->nWidth, FALSE) || @@ -1720,7 +1720,7 @@ BOOL update_write_line_to_order(wStream* s, ORDER_INFO* orderInfo, const LINE_TO static BOOL update_read_polyline_order(const char* orderName, wStream* s, const ORDER_INFO* orderInfo, POLYLINE_ORDER* polyline) { - UINT32 word; + UINT32 word = 0; UINT32 new_num = polyline->numDeltaEntries; if (!read_order_field_coord(orderName, orderInfo, s, 1, &polyline->xStart, FALSE) || !read_order_field_coord(orderName, orderInfo, s, 2, &polyline->yStart, FALSE) || @@ -1786,7 +1786,7 @@ size_t update_approximate_memblt_order(ORDER_INFO* orderInfo, const MEMBLT_ORDER BOOL update_write_memblt_order(wStream* s, ORDER_INFO* orderInfo, const MEMBLT_ORDER* memblt) { - UINT16 cacheId; + UINT16 cacheId = 0; if (!Stream_EnsureRemainingCapacity(s, update_approximate_memblt_order(orderInfo, memblt))) return FALSE; @@ -2011,9 +2011,9 @@ static BOOL update_read_fast_glyph_order(const char* orderName, wStream* s, if ((orderInfo->fieldFlags & ORDER_FIELD_15) != 0) { - const BYTE* src; + const BYTE* src = NULL; wStream subbuffer; - wStream* sub; + wStream* sub = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -2176,7 +2176,7 @@ static BOOL update_read_ellipse_cb_order(const char* orderName, wStream* s, static CACHE_BITMAP_ORDER* update_read_cache_bitmap_order(rdpUpdate* update, wStream* s, BOOL compressed, UINT16 flags) { - CACHE_BITMAP_ORDER* cache_bitmap; + CACHE_BITMAP_ORDER* cache_bitmap = NULL; rdp_update_internal* up = update_cast(update); if (!update || !s) @@ -2294,9 +2294,9 @@ BOOL update_write_cache_bitmap_order(wStream* s, const CACHE_BITMAP_ORDER* cache static CACHE_BITMAP_V2_ORDER* update_read_cache_bitmap_v2_order(rdpUpdate* update, wStream* s, BOOL compressed, UINT16 flags) { - BOOL rc; - BYTE bitsPerPixelId; - CACHE_BITMAP_V2_ORDER* cache_bitmap_v2; + BOOL rc = 0; + BYTE bitsPerPixelId = 0; + CACHE_BITMAP_V2_ORDER* cache_bitmap_v2 = NULL; if (!update || !s) return NULL; @@ -2399,8 +2399,8 @@ size_t update_approximate_cache_bitmap_v2_order(CACHE_BITMAP_V2_ORDER* cache_bit BOOL update_write_cache_bitmap_v2_order(wStream* s, CACHE_BITMAP_V2_ORDER* cache_bitmap_v2, BOOL compressed, UINT16* flags) { - BOOL rc; - BYTE bitsPerPixelId; + BOOL rc = 0; + BYTE bitsPerPixelId = 0; if (!Stream_EnsureRemainingCapacity( s, update_approximate_cache_bitmap_v2_order(cache_bitmap_v2, compressed, flags))) @@ -2470,12 +2470,12 @@ BOOL update_write_cache_bitmap_v2_order(wStream* s, CACHE_BITMAP_V2_ORDER* cache static CACHE_BITMAP_V3_ORDER* update_read_cache_bitmap_v3_order(rdpUpdate* update, wStream* s, UINT16 flags) { - BOOL rc; - BYTE bitsPerPixelId; - BITMAP_DATA_EX* bitmapData; - UINT32 new_len; - BYTE* new_data; - CACHE_BITMAP_V3_ORDER* cache_bitmap_v3; + BOOL rc = 0; + BYTE bitsPerPixelId = 0; + BITMAP_DATA_EX* bitmapData = NULL; + UINT32 new_len = 0; + BYTE* new_data = NULL; + CACHE_BITMAP_V3_ORDER* cache_bitmap_v3 = NULL; rdp_update_internal* up = update_cast(update); if (!update || !s) @@ -2545,9 +2545,9 @@ size_t update_approximate_cache_bitmap_v3_order(CACHE_BITMAP_V3_ORDER* cache_bit BOOL update_write_cache_bitmap_v3_order(wStream* s, CACHE_BITMAP_V3_ORDER* cache_bitmap_v3, UINT16* flags) { - BOOL rc; - BYTE bitsPerPixelId; - BITMAP_DATA_EX* bitmapData; + BOOL rc = 0; + BYTE bitsPerPixelId = 0; + BITMAP_DATA_EX* bitmapData = NULL; if (!Stream_EnsureRemainingCapacity( s, update_approximate_cache_bitmap_v3_order(cache_bitmap_v3, flags))) @@ -2575,8 +2575,8 @@ BOOL update_write_cache_bitmap_v3_order(wStream* s, CACHE_BITMAP_V3_ORDER* cache static CACHE_COLOR_TABLE_ORDER* update_read_cache_color_table_order(rdpUpdate* update, wStream* s, UINT16 flags) { - int i; - UINT32* colorTable; + int i = 0; + UINT32* colorTable = NULL; CACHE_COLOR_TABLE_ORDER* cache_color_table = calloc(1, sizeof(CACHE_COLOR_TABLE_ORDER)); if (!cache_color_table) @@ -2624,9 +2624,9 @@ BOOL update_write_cache_color_table_order(wStream* s, const CACHE_COLOR_TABLE_ORDER* cache_color_table, UINT16* flags) { - size_t i; - size_t inf; - const UINT32* colorTable; + size_t i = 0; + size_t inf = 0; + const UINT32* colorTable = NULL; if (cache_color_table->numberColors != 256) return FALSE; @@ -2649,7 +2649,7 @@ BOOL update_write_cache_color_table_order(wStream* s, } static CACHE_GLYPH_ORDER* update_read_cache_glyph_order(rdpUpdate* update, wStream* s, UINT16 flags) { - UINT32 i; + UINT32 i = 0; CACHE_GLYPH_ORDER* cache_glyph_order = calloc(1, sizeof(CACHE_GLYPH_ORDER)); WINPR_ASSERT(update); @@ -2720,9 +2720,9 @@ size_t update_approximate_cache_glyph_order(const CACHE_GLYPH_ORDER* cache_glyph BOOL update_write_cache_glyph_order(wStream* s, const CACHE_GLYPH_ORDER* cache_glyph, UINT16* flags) { - UINT32 i; - INT16 lsi16; - const GLYPH_DATA* glyph; + UINT32 i = 0; + INT16 lsi16 = 0; + const GLYPH_DATA* glyph = NULL; size_t inf = update_approximate_cache_glyph_order(cache_glyph, flags); if (!Stream_EnsureRemainingCapacity(s, inf)) @@ -2733,7 +2733,7 @@ BOOL update_write_cache_glyph_order(wStream* s, const CACHE_GLYPH_ORDER* cache_g for (i = 0; i < cache_glyph->cGlyphs; i++) { - UINT32 cb; + UINT32 cb = 0; glyph = &cache_glyph->glyphData[i]; Stream_Write_UINT16(s, glyph->cacheIndex); /* cacheIndex (2 bytes) */ lsi16 = glyph->x; @@ -2758,7 +2758,7 @@ BOOL update_write_cache_glyph_order(wStream* s, const CACHE_GLYPH_ORDER* cache_g static CACHE_GLYPH_V2_ORDER* update_read_cache_glyph_v2_order(rdpUpdate* update, wStream* s, UINT16 flags) { - UINT32 i; + UINT32 i = 0; CACHE_GLYPH_V2_ORDER* cache_glyph_v2 = calloc(1, sizeof(CACHE_GLYPH_V2_ORDER)); if (!cache_glyph_v2) @@ -2828,7 +2828,7 @@ size_t update_approximate_cache_glyph_v2_order(const CACHE_GLYPH_V2_ORDER* cache BOOL update_write_cache_glyph_v2_order(wStream* s, const CACHE_GLYPH_V2_ORDER* cache_glyph_v2, UINT16* flags) { - UINT32 i; + UINT32 i = 0; size_t inf = update_approximate_cache_glyph_v2_order(cache_glyph_v2, flags); if (!Stream_EnsureRemainingCapacity(s, inf)) @@ -2839,7 +2839,7 @@ BOOL update_write_cache_glyph_v2_order(wStream* s, const CACHE_GLYPH_V2_ORDER* c for (i = 0; i < cache_glyph_v2->cGlyphs; i++) { - UINT32 cb; + UINT32 cb = 0; const GLYPH_DATA_V2* glyph = &cache_glyph_v2->glyphData[i]; Stream_Write_UINT8(s, glyph->cacheIndex); @@ -2864,9 +2864,9 @@ BOOL update_write_cache_glyph_v2_order(wStream* s, const CACHE_GLYPH_V2_ORDER* c } static BOOL update_decompress_brush(wStream* s, BYTE* output, size_t outSize, BYTE bpp) { - size_t x; - size_t k; - INT8 y; + size_t x = 0; + size_t k = 0; + INT8 y = 0; BYTE byte = 0; const BYTE* palette = Stream_PointerAs(s, const BYTE) + 16; const size_t bytesPerPixel = ((bpp + 1) / 8); @@ -2878,7 +2878,7 @@ static BOOL update_decompress_brush(wStream* s, BYTE* output, size_t outSize, BY { for (x = 0; x < 8; x++) { - UINT32 index; + UINT32 index = 0; if ((x % 4) == 0) Stream_Read_UINT8(s, byte); @@ -2903,9 +2903,9 @@ static BOOL update_compress_brush(wStream* s, const BYTE* input, BYTE bpp) } static CACHE_BRUSH_ORDER* update_read_cache_brush_order(rdpUpdate* update, wStream* s, UINT16 flags) { - int i; - BOOL rc; - BYTE iBitmapFormat; + int i = 0; + BOOL rc = 0; + BYTE iBitmapFormat = 0; BOOL compressed = FALSE; rdp_update_internal* up = update_cast(update); CACHE_BRUSH_ORDER* cache_brush = calloc(1, sizeof(CACHE_BRUSH_ORDER)); @@ -2998,9 +2998,9 @@ size_t update_approximate_cache_brush_order(const CACHE_BRUSH_ORDER* cache_brush BOOL update_write_cache_brush_order(wStream* s, const CACHE_BRUSH_ORDER* cache_brush, UINT16* flags) { - int i; - BYTE iBitmapFormat; - BOOL rc; + int i = 0; + BYTE iBitmapFormat = 0; + BOOL rc = 0; BOOL compressed = FALSE; if (!Stream_EnsureRemainingCapacity(s, @@ -3067,9 +3067,9 @@ static BOOL update_read_create_offscreen_bitmap_order(wStream* s, CREATE_OFFSCREEN_BITMAP_ORDER* create_offscreen_bitmap) { - UINT16 flags; - BOOL deleteListPresent; - OFFSCREEN_DELETE_LIST* deleteList; + UINT16 flags = 0; + BOOL deleteListPresent = 0; + OFFSCREEN_DELETE_LIST* deleteList = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, s, 6)) return FALSE; @@ -3090,7 +3090,7 @@ update_read_create_offscreen_bitmap_order(wStream* s, if (deleteListPresent) { - UINT32 i; + UINT32 i = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 2)) return FALSE; @@ -3099,7 +3099,7 @@ update_read_create_offscreen_bitmap_order(wStream* s, if (deleteList->cIndices > deleteList->sIndices) { - UINT16* new_indices; + UINT16* new_indices = NULL; new_indices = (UINT16*)realloc(deleteList->indices, deleteList->cIndices * 2); if (!new_indices) @@ -3128,7 +3128,7 @@ update_read_create_offscreen_bitmap_order(wStream* s, size_t update_approximate_create_offscreen_bitmap_order( const CREATE_OFFSCREEN_BITMAP_ORDER* create_offscreen_bitmap) { - const OFFSCREEN_DELETE_LIST* deleteList; + const OFFSCREEN_DELETE_LIST* deleteList = NULL; WINPR_ASSERT(create_offscreen_bitmap); @@ -3141,9 +3141,9 @@ size_t update_approximate_create_offscreen_bitmap_order( BOOL update_write_create_offscreen_bitmap_order( wStream* s, const CREATE_OFFSCREEN_BITMAP_ORDER* create_offscreen_bitmap) { - UINT16 flags; - BOOL deleteListPresent; - const OFFSCREEN_DELETE_LIST* deleteList; + UINT16 flags = 0; + BOOL deleteListPresent = 0; + const OFFSCREEN_DELETE_LIST* deleteList = NULL; if (!Stream_EnsureRemainingCapacity( s, update_approximate_create_offscreen_bitmap_order(create_offscreen_bitmap))) @@ -3162,7 +3162,7 @@ BOOL update_write_create_offscreen_bitmap_order( if (deleteListPresent) { - int i; + int i = 0; Stream_Write_UINT16(s, deleteList->cIndices); for (i = 0; i < (int)deleteList->cIndices; i++) @@ -3199,7 +3199,7 @@ static BOOL update_read_create_nine_grid_bitmap_order(wStream* s, CREATE_NINE_GRID_BITMAP_ORDER* create_nine_grid_bitmap) { - NINE_GRID_BITMAP_INFO* nineGridInfo; + NINE_GRID_BITMAP_INFO* nineGridInfo = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, s, 19)) return FALSE; @@ -3356,8 +3356,8 @@ update_read_draw_gdiplus_cache_end_order(wStream* s, } static BOOL update_read_field_flags(wStream* s, UINT32* fieldFlags, BYTE flags, BYTE fieldBytes) { - int i; - BYTE byte; + int i = 0; + BYTE byte = 0; if (flags & ORDER_ZERO_FIELD_BYTE_BIT0) fieldBytes--; @@ -3385,7 +3385,7 @@ static BOOL update_read_field_flags(wStream* s, UINT32* fieldFlags, BYTE flags, } BOOL update_write_field_flags(wStream* s, UINT32 fieldFlags, BYTE flags, BYTE fieldBytes) { - BYTE byte; + BYTE byte = 0; if (fieldBytes == 1) { @@ -3417,7 +3417,7 @@ BOOL update_write_field_flags(wStream* s, UINT32 fieldFlags, BYTE flags, BYTE fi } static BOOL update_read_bounds(wStream* s, rdpBounds* bounds) { - BYTE flags; + BYTE flags = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -3639,15 +3639,15 @@ static BOOL read_primary_order(wLog* log, const char* orderName, wStream* s, static BOOL update_recv_primary_order(rdpUpdate* update, wStream* s, BYTE flags) { - BYTE field; + BYTE field = 0; BOOL rc = FALSE; rdp_update_internal* up = update_cast(update); rdpContext* context = update->context; rdp_primary_update_internal* primary = primary_update_cast(update->primary); - ORDER_INFO* orderInfo; - rdpSettings* settings; - const char* orderName; - BOOL defaultReturn; + ORDER_INFO* orderInfo = NULL; + rdpSettings* settings = NULL; + const char* orderName = NULL; + BOOL defaultReturn = 0; WINPR_ASSERT(s); @@ -3919,20 +3919,20 @@ static BOOL update_recv_primary_order(rdpUpdate* update, wStream* s, BYTE flags) static BOOL update_recv_secondary_order(rdpUpdate* update, wStream* s, BYTE flags) { BOOL rc = FALSE; - size_t start; - size_t end; - size_t pos; - size_t diff; - BYTE orderType; - UINT16 extraFlags; - INT16 orderLength; - INT32 orderLengthFull; + size_t start = 0; + size_t end = 0; + size_t pos = 0; + size_t diff = 0; + BYTE orderType = 0; + UINT16 extraFlags = 0; + INT16 orderLength = 0; + INT32 orderLengthFull = 0; rdp_update_internal* up = update_cast(update); rdpContext* context = update->context; rdpSettings* settings = context->settings; rdpSecondaryUpdate* secondary = update->secondary; - const char* name; - BOOL defaultReturn; + const char* name = NULL; + BOOL defaultReturn = 0; defaultReturn = freerdp_settings_get_bool(settings, FreeRDP_DeactivateClientDecoding); @@ -4290,8 +4290,8 @@ static BOOL update_recv_altsec_order(rdpUpdate* update, wStream* s, BYTE flags) } BOOL update_recv_order(rdpUpdate* update, wStream* s) { - BOOL rc; - BYTE controlFlags; + BOOL rc = 0; + BYTE controlFlags = 0; rdp_update_internal* up = update_cast(update); if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) diff --git a/libfreerdp/core/peer.c b/libfreerdp/core/peer.c index 3556319af..c8ba0c6c5 100644 --- a/libfreerdp/core/peer.c +++ b/libfreerdp/core/peer.c @@ -47,11 +47,11 @@ static state_run_t peer_recv_pdu(freerdp_peer* client, wStream* s); static HANDLE freerdp_peer_virtual_channel_open(freerdp_peer* client, const char* name, UINT32 flags) { - UINT32 index; + UINT32 index = 0; BOOL joined = FALSE; rdpMcsChannel* mcsChannel = NULL; rdpPeerChannel* peerChannel = NULL; - rdpMcs* mcs; + rdpMcs* mcs = NULL; WINPR_ASSERT(client); WINPR_ASSERT(client->context); @@ -126,14 +126,14 @@ static BOOL freerdp_peer_virtual_channel_close(freerdp_peer* client, HANDLE hCha static int freerdp_peer_virtual_channel_write(freerdp_peer* client, HANDLE hChannel, const BYTE* buffer, UINT32 length) { - wStream* s; - UINT32 flags; - UINT32 chunkSize; - UINT32 maxChunkSize; - UINT32 totalLength; - rdpPeerChannel* peerChannel; - rdpMcsChannel* mcsChannel; - rdpRdp* rdp; + wStream* s = NULL; + UINT32 flags = 0; + UINT32 chunkSize = 0; + UINT32 maxChunkSize = 0; + UINT32 totalLength = 0; + rdpPeerChannel* peerChannel = NULL; + rdpMcsChannel* mcsChannel = NULL; + rdpRdp* rdp = NULL; WINPR_ASSERT(client); WINPR_ASSERT(client->context); @@ -230,8 +230,8 @@ static BOOL freerdp_peer_set_state(freerdp_peer* client, CONNECTION_STATE state) static BOOL freerdp_peer_initialize(freerdp_peer* client) { - rdpRdp* rdp; - rdpSettings* settings; + rdpRdp* rdp = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(client); WINPR_ASSERT(client->context); @@ -276,7 +276,7 @@ static BOOL freerdp_peer_initialize(freerdp_peer* client) #if defined(WITH_FREERDP_DEPRECATED) static BOOL freerdp_peer_get_fds(freerdp_peer* client, void** rfds, int* rcount) { - rdpTransport* transport; + rdpTransport* transport = NULL; WINPR_ASSERT(client); WINPR_ASSERT(client->context); WINPR_ASSERT(client->context->rdp); @@ -291,7 +291,7 @@ static BOOL freerdp_peer_get_fds(freerdp_peer* client, void** rfds, int* rcount) static HANDLE freerdp_peer_get_event_handle(freerdp_peer* client) { HANDLE hEvent = NULL; - rdpTransport* transport; + rdpTransport* transport = NULL; WINPR_ASSERT(client); WINPR_ASSERT(client->context); WINPR_ASSERT(client->context->rdp); @@ -311,8 +311,8 @@ static DWORD freerdp_peer_get_event_handles(freerdp_peer* client, HANDLE* events static BOOL freerdp_peer_check_fds(freerdp_peer* peer) { - int status; - rdpRdp* rdp; + int status = 0; + rdpRdp* rdp = NULL; WINPR_ASSERT(peer); WINPR_ASSERT(peer->context); @@ -328,12 +328,12 @@ static BOOL freerdp_peer_check_fds(freerdp_peer* peer) static state_run_t peer_recv_data_pdu(freerdp_peer* client, wStream* s, UINT16 totalLength) { - BYTE type; - UINT16 length; - UINT32 share_id; - BYTE compressed_type; - UINT16 compressed_len; - rdpUpdate* update; + BYTE type = 0; + UINT16 length = 0; + UINT32 share_id = 0; + BYTE compressed_type = 0; + UINT16 compressed_len = 0; + rdpUpdate* update = NULL; WINPR_ASSERT(s); WINPR_ASSERT(client); @@ -421,13 +421,13 @@ static state_run_t peer_recv_data_pdu(freerdp_peer* client, wStream* s, UINT16 t static state_run_t peer_recv_tpkt_pdu(freerdp_peer* client, wStream* s) { state_run_t rc = STATE_RUN_SUCCESS; - rdpRdp* rdp; - UINT16 length; - UINT16 pduType; - UINT16 pduSource; - UINT16 channelId; + rdpRdp* rdp = NULL; + UINT16 length = 0; + UINT16 pduType = 0; + UINT16 pduSource = 0; + UINT16 channelId = 0; UINT16 securityFlags = 0; - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(s); WINPR_ASSERT(client); @@ -474,8 +474,8 @@ static state_run_t peer_recv_tpkt_pdu(freerdp_peer* client, wStream* s) if (channelId == MCS_GLOBAL_CHANNEL_ID) { char buffer[256] = { 0 }; - UINT16 pduLength; - UINT16 remain; + UINT16 pduLength = 0; + UINT16 remain = 0; if (!rdp_read_share_control_header(rdp, s, &pduLength, &remain, &pduType, &pduSource)) return STATE_RUN_FAILED; @@ -534,7 +534,7 @@ static state_run_t peer_recv_tpkt_pdu(freerdp_peer* client, wStream* s) static state_run_t peer_recv_handle_auto_detect(freerdp_peer* client, wStream* s) { state_run_t ret = STATE_RUN_FAILED; - rdpRdp* rdp; + rdpRdp* rdp = NULL; WINPR_ASSERT(client); WINPR_ASSERT(s); @@ -608,8 +608,8 @@ static state_run_t peer_recv_handle_auto_detect(freerdp_peer* client, wStream* s static state_run_t peer_recv_handle_licensing(freerdp_peer* client, wStream* s) { state_run_t ret = STATE_RUN_FAILED; - rdpRdp* rdp; - rdpSettings* settings; + rdpRdp* rdp = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(client); WINPR_ASSERT(s); @@ -660,10 +660,10 @@ static state_run_t peer_recv_handle_licensing(freerdp_peer* client, wStream* s) static state_run_t peer_recv_fastpath_pdu(freerdp_peer* client, wStream* s) { - rdpRdp* rdp; - UINT16 length; - BOOL rc; - rdpFastPath* fastpath; + rdpRdp* rdp = NULL; + UINT16 length = 0; + BOOL rc = 0; + rdpFastPath* fastpath = NULL; WINPR_ASSERT(s); WINPR_ASSERT(client); @@ -796,11 +796,11 @@ static state_run_t rdp_peer_handle_state_active(freerdp_peer* client) static state_run_t peer_recv_callback_internal(rdpTransport* transport, wStream* s, void* extra) { - UINT32 SelectedProtocol; + UINT32 SelectedProtocol = 0; freerdp_peer* client = (freerdp_peer*)extra; - rdpRdp* rdp; + rdpRdp* rdp = NULL; state_run_t ret = STATE_RUN_FAILED; - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(transport); WINPR_ASSERT(client); @@ -1193,8 +1193,8 @@ static state_run_t peer_recv_callback(rdpTransport* transport, wStream* s, void* static BOOL freerdp_peer_close(freerdp_peer* client) { - UINT32 SelectedProtocol; - rdpContext* context; + UINT32 SelectedProtocol = 0; + rdpContext* context = NULL; WINPR_ASSERT(client); @@ -1229,7 +1229,7 @@ static BOOL freerdp_peer_close(freerdp_peer* client) static void freerdp_peer_disconnect(freerdp_peer* client) { - rdpTransport* transport; + rdpTransport* transport = NULL; WINPR_ASSERT(client); transport = freerdp_get_transport(client->context); @@ -1278,7 +1278,7 @@ static BOOL freerdp_peer_send_channel_packet(freerdp_peer* client, UINT16 channe static BOOL freerdp_peer_is_write_blocked(freerdp_peer* peer) { - rdpTransport* transport; + rdpTransport* transport = NULL; WINPR_ASSERT(peer); WINPR_ASSERT(peer->context); WINPR_ASSERT(peer->context->rdp); @@ -1289,7 +1289,7 @@ static BOOL freerdp_peer_is_write_blocked(freerdp_peer* peer) static int freerdp_peer_drain_output_buffer(freerdp_peer* peer) { - rdpTransport* transport; + rdpTransport* transport = NULL; WINPR_ASSERT(peer); WINPR_ASSERT(peer->context); WINPR_ASSERT(peer->context->rdp); @@ -1308,7 +1308,7 @@ static BOOL freerdp_peer_has_more_to_read(freerdp_peer* peer) static LicenseCallbackResult freerdp_peer_nolicense(freerdp_peer* peer, wStream* s) { - rdpRdp* rdp; + rdpRdp* rdp = NULL; WINPR_ASSERT(peer); WINPR_ASSERT(peer->context); @@ -1384,8 +1384,8 @@ static const char* os_major_type_to_string(UINT16 osMajorType) const char* freerdp_peer_os_major_type_string(freerdp_peer* client) { - rdpContext* context; - UINT16 osMajorType; + rdpContext* context = NULL; + UINT16 osMajorType = 0; WINPR_ASSERT(client); @@ -1429,8 +1429,8 @@ static const char* os_minor_type_to_string(UINT16 osMinorType) const char* freerdp_peer_os_minor_type_string(freerdp_peer* client) { - rdpContext* context; - UINT16 osMinorType; + rdpContext* context = NULL; + UINT16 osMinorType = 0; WINPR_ASSERT(client); @@ -1445,8 +1445,8 @@ const char* freerdp_peer_os_minor_type_string(freerdp_peer* client) freerdp_peer* freerdp_peer_new(int sockfd) { - UINT32 option_value; - socklen_t option_len; + UINT32 option_value = 0; + socklen_t option_len = 0; freerdp_peer* client = (freerdp_peer*)calloc(1, sizeof(freerdp_peer)); if (!client) @@ -1501,7 +1501,7 @@ void freerdp_peer_free(freerdp_peer* client) static BOOL freerdp_peer_transport_setup(freerdp_peer* client) { - rdpRdp* rdp; + rdpRdp* rdp = NULL; WINPR_ASSERT(client); WINPR_ASSERT(client->context); @@ -1523,8 +1523,8 @@ static BOOL freerdp_peer_transport_setup(freerdp_peer* client) BOOL freerdp_peer_context_new_ex(freerdp_peer* client, const rdpSettings* settings) { - rdpRdp* rdp; - rdpContext* context; + rdpRdp* rdp = NULL; + rdpContext* context = NULL; BOOL ret = TRUE; if (!client) diff --git a/libfreerdp/core/proxy.c b/libfreerdp/core/proxy.c index d43215e28..9312c22a6 100644 --- a/libfreerdp/core/proxy.c +++ b/libfreerdp/core/proxy.c @@ -109,7 +109,7 @@ BOOL proxy_prepare(rdpSettings* settings, const char** lpPeerHostname, UINT16* l static BOOL value_to_int(const char* value, LONGLONG* result, LONGLONG min, LONGLONG max) { - long long rc; + long long rc = 0; if (!value || !result) return FALSE; @@ -129,9 +129,9 @@ static BOOL value_to_int(const char* value, LONGLONG* result, LONGLONG min, LONG static BOOL cidr4_match(const struct in_addr* addr, const struct in_addr* net, BYTE bits) { - uint32_t mask; - uint32_t amask; - uint32_t nmask; + uint32_t mask = 0; + uint32_t amask = 0; + uint32_t nmask = 0; if (bits == 0) return TRUE; @@ -147,8 +147,8 @@ static BOOL cidr6_match(const struct in6_addr* address, const struct in6_addr* n { const uint32_t* a = (const uint32_t*)address; const uint32_t* n = (const uint32_t*)network; - size_t bits_whole; - size_t bits_incomplete; + size_t bits_whole = 0; + size_t bits_incomplete = 0; bits_whole = bits >> 5; bits_incomplete = bits & 0x1F; @@ -173,10 +173,10 @@ static BOOL check_no_proxy(rdpSettings* settings, const char* no_proxy) { const char* delimiter = ","; BOOL result = FALSE; - char* current; - char* copy; + char* current = NULL; + char* copy = NULL; char* context = NULL; - size_t host_len; + size_t host_len = 0; struct sockaddr_in sa4; struct sockaddr_in6 sa6; BOOL is_ipv4 = FALSE; @@ -284,8 +284,8 @@ static BOOL check_no_proxy(rdpSettings* settings, const char* no_proxy) void proxy_read_environment(rdpSettings* settings, char* envname) { - DWORD envlen; - char* env; + DWORD envlen = 0; + char* env = NULL; envlen = GetEnvironmentVariableA(envname, NULL, 0); if (!envlen) @@ -328,9 +328,9 @@ BOOL proxy_parse_uri(rdpSettings* settings, const char* uri_in) { BOOL rc = FALSE; const char* protocol = ""; - UINT16 port; - char* p; - char* atPtr; + UINT16 port = 0; + char* p = NULL; + char* atPtr = NULL; char* uri_copy = _strdup(uri_in); char* uri = uri_copy; if (!uri) @@ -417,7 +417,7 @@ BOOL proxy_parse_uri(rdpSettings* settings, const char* uri_in) if (p) { - LONGLONG val; + LONGLONG val = 0; if (!value_to_int(&p[1], &val, 0, UINT16_MAX)) { @@ -521,15 +521,15 @@ static BOOL http_proxy_connect(BIO* bufferedBio, const char* proxyUsername, const char* proxyPassword, const char* hostname, UINT16 port) { BOOL rc = FALSE; - int status; - wStream* s; + int status = 0; + wStream* s = NULL; char port_str[10] = { 0 }; char recv_buf[256] = { 0 }; char* eol = NULL; size_t resultsize = 0; - size_t reserveSize; - size_t portLen; - size_t hostLen; + size_t reserveSize = 0; + size_t portLen = 0; + size_t hostLen = 0; const char connect[] = "CONNECT "; const char httpheader[] = " HTTP/1.1" CRLF "Host: "; @@ -567,7 +567,7 @@ static BOOL http_proxy_connect(BIO* bufferedBio, const char* proxyUsername, else { const char basic[] = CRLF "Proxy-Authorization: Basic "; - char* base64; + char* base64 = NULL; sprintf_s(creds, size, "%s:%s", proxyUsername, proxyPassword); base64 = crypto_base64_encode((const BYTE*)creds, size - 1); @@ -664,7 +664,7 @@ fail: static int recv_socks_reply(BIO* bufferedBio, BYTE* buf, int len, char* reason, BYTE checkVer) { - int status; + int status = 0; for (;;) { @@ -714,7 +714,7 @@ static int recv_socks_reply(BIO* bufferedBio, BYTE* buf, int len, char* reason, static BOOL socks_proxy_connect(BIO* bufferedBio, const char* proxyUsername, const char* proxyPassword, const char* hostname, UINT16 port) { - int status; + int status = 0; int nauthMethods = 1; int writeLen = 3; BYTE buf[3 + 255 + 255]; /* biggest packet is user/pass auth */ @@ -761,7 +761,7 @@ static BOOL socks_proxy_connect(BIO* bufferedBio, const char* proxyUsername, { int usernameLen = strnlen(proxyUsername, 255); int userpassLen = strnlen(proxyPassword, 255); - BYTE* ptr; + BYTE* ptr = NULL; if (nauthMethods < 2) { diff --git a/libfreerdp/core/rdp.c b/libfreerdp/core/rdp.c index 44caa915c..f4a50453e 100644 --- a/libfreerdp/core/rdp.c +++ b/libfreerdp/core/rdp.c @@ -395,7 +395,7 @@ static BOOL rdp_security_stream_init(rdpRdp* rdp, wStream* s, BOOL sec_header) wStream* rdp_send_stream_init(rdpRdp* rdp) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(rdp); WINPR_ASSERT(rdp->transport); @@ -487,7 +487,7 @@ BOOL rdp_set_error_info(rdpRdp* rdp, UINT32 errorInfo) wStream* rdp_message_channel_pdu_init(rdpRdp* rdp) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(rdp); @@ -520,19 +520,17 @@ fail: BOOL rdp_read_header(rdpRdp* rdp, wStream* s, UINT16* length, UINT16* channelId) { - BYTE li; - BYTE byte; - BYTE code; - BYTE choice; - UINT16 initiator; - DomainMCSPDU MCSPDU; - DomainMCSPDU domainMCSPDU; + BYTE li = 0; + BYTE byte = 0; + BYTE code = 0; + BYTE choice = 0; + UINT16 initiator = 0; WINPR_ASSERT(rdp); WINPR_ASSERT(rdp->settings); WINPR_ASSERT(s); - MCSPDU = (rdp->settings->ServerMode) ? DomainMCSPDU_SendDataRequest - : DomainMCSPDU_SendDataIndication; + DomainMCSPDU MCSPDU = (rdp->settings->ServerMode) ? DomainMCSPDU_SendDataRequest + : DomainMCSPDU_SendDataIndication; *channelId = 0; /* Initialize in case of early abort */ if (!tpkt_read_header(s, length)) @@ -559,7 +557,7 @@ BOOL rdp_read_header(rdpRdp* rdp, wStream* s, UINT16* length, UINT16* channelId) if (!per_read_choice(s, &choice)) return FALSE; - domainMCSPDU = (DomainMCSPDU)(choice >> 2); + const DomainMCSPDU domainMCSPDU = (DomainMCSPDU)(choice >> 2); if (domainMCSPDU != MCSPDU) { @@ -650,15 +648,13 @@ BOOL rdp_read_header(rdpRdp* rdp, wStream* s, UINT16* length, UINT16* channelId) BOOL rdp_write_header(rdpRdp* rdp, wStream* s, UINT16 length, UINT16 channelId) { - DomainMCSPDU MCSPDU; - WINPR_ASSERT(rdp); WINPR_ASSERT(rdp->settings); WINPR_ASSERT(s); WINPR_ASSERT(length >= RDP_PACKET_HEADER_MAX_LENGTH); - MCSPDU = (rdp->settings->ServerMode) ? DomainMCSPDU_SendDataIndication - : DomainMCSPDU_SendDataRequest; + DomainMCSPDU MCSPDU = (rdp->settings->ServerMode) ? DomainMCSPDU_SendDataIndication + : DomainMCSPDU_SendDataRequest; if ((rdp->sec_flags & SEC_ENCRYPT) && (rdp->settings->EncryptionMethods == ENCRYPTION_METHOD_FIPS)) @@ -693,7 +689,7 @@ BOOL rdp_write_header(rdpRdp* rdp, wStream* s, UINT16 length, UINT16 channelId) static BOOL rdp_security_stream_out(rdpRdp* rdp, wStream* s, int length, UINT32 sec_flags, UINT32* pad) { - BOOL status; + BOOL status = 0; WINPR_ASSERT(rdp); sec_flags |= rdp->sec_flags; *pad = 0; @@ -775,7 +771,7 @@ static BOOL rdp_security_stream_out(rdpRdp* rdp, wStream* s, int length, UINT32 static UINT32 rdp_get_sec_bytes(rdpRdp* rdp, UINT16 sec_flags) { - UINT32 sec_bytes; + UINT32 sec_bytes = 0; if (rdp->sec_flags & SEC_ENCRYPT) { @@ -806,8 +802,8 @@ static UINT32 rdp_get_sec_bytes(rdpRdp* rdp, UINT16 sec_flags) BOOL rdp_send(rdpRdp* rdp, wStream* s, UINT16 channel_id) { BOOL rc = FALSE; - UINT32 pad; - UINT16 length; + UINT32 pad = 0; + UINT16 length = 0; if (!s) return FALSE; @@ -838,10 +834,10 @@ fail: BOOL rdp_send_pdu(rdpRdp* rdp, wStream* s, UINT16 type, UINT16 channel_id) { - UINT16 length; - UINT32 sec_bytes; - size_t sec_hold; - UINT32 pad; + UINT16 length = 0; + UINT32 sec_bytes = 0; + size_t sec_hold = 0; + UINT32 pad = 0; if (!rdp || !s) return FALSE; @@ -873,10 +869,10 @@ BOOL rdp_send_pdu(rdpRdp* rdp, wStream* s, UINT16 type, UINT16 channel_id) BOOL rdp_send_data_pdu(rdpRdp* rdp, wStream* s, BYTE type, UINT16 channel_id) { BOOL rc = FALSE; - size_t length; - UINT32 sec_bytes; - size_t sec_hold; - UINT32 pad; + size_t length = 0; + UINT32 sec_bytes = 0; + size_t sec_hold = 0; + UINT32 pad = 0; if (!s) return FALSE; @@ -920,8 +916,8 @@ fail: BOOL rdp_send_message_channel_pdu(rdpRdp* rdp, wStream* s, UINT16 sec_flags) { BOOL rc = FALSE; - UINT16 length; - UINT32 pad; + UINT16 length = 0; + UINT32 pad = 0; WINPR_ASSERT(rdp); WINPR_ASSERT(s); @@ -954,8 +950,8 @@ static BOOL rdp_recv_server_shutdown_denied_pdu(rdpRdp* rdp, wStream* s) static BOOL rdp_recv_server_set_keyboard_indicators_pdu(rdpRdp* rdp, wStream* s) { - UINT16 unitId; - UINT16 ledFlags; + UINT16 unitId = 0; + UINT16 ledFlags = 0; WINPR_ASSERT(rdp); WINPR_ASSERT(s); @@ -974,9 +970,9 @@ static BOOL rdp_recv_server_set_keyboard_indicators_pdu(rdpRdp* rdp, wStream* s) static BOOL rdp_recv_server_set_keyboard_ime_status_pdu(rdpRdp* rdp, wStream* s) { - UINT16 unitId; - UINT32 imeState; - UINT32 imeConvMode; + UINT16 unitId = 0; + UINT32 imeState = 0; + UINT32 imeConvMode = 0; if (!rdp || !rdp->input) return FALSE; @@ -993,7 +989,7 @@ static BOOL rdp_recv_server_set_keyboard_ime_status_pdu(rdpRdp* rdp, wStream* s) static BOOL rdp_recv_set_error_info_data_pdu(rdpRdp* rdp, wStream* s) { - UINT32 errorInfo; + UINT32 errorInfo = 0; if (!Stream_CheckAndLogRequiredLengthWLog(rdp->log, s, 4)) return FALSE; @@ -1004,7 +1000,7 @@ static BOOL rdp_recv_set_error_info_data_pdu(rdpRdp* rdp, wStream* s) static BOOL rdp_recv_server_auto_reconnect_status_pdu(rdpRdp* rdp, wStream* s) { - UINT32 arcStatus; + UINT32 arcStatus = 0; if (!Stream_CheckAndLogRequiredLengthWLog(rdp->log, s, 4)) return FALSE; @@ -1016,7 +1012,7 @@ static BOOL rdp_recv_server_auto_reconnect_status_pdu(rdpRdp* rdp, wStream* s) static BOOL rdp_recv_server_status_info_pdu(rdpRdp* rdp, wStream* s) { - UINT32 statusCode; + UINT32 statusCode = 0; if (!Stream_CheckAndLogRequiredLengthWLog(rdp->log, s, 4)) return FALSE; @@ -1031,10 +1027,10 @@ static BOOL rdp_recv_server_status_info_pdu(rdpRdp* rdp, wStream* s) static BOOL rdp_recv_monitor_layout_pdu(rdpRdp* rdp, wStream* s) { - UINT32 index; - UINT32 monitorCount; - MONITOR_DEF* monitor; - MONITOR_DEF* monitorDefArray; + UINT32 index = 0; + UINT32 monitorCount = 0; + MONITOR_DEF* monitor = NULL; + MONITOR_DEF* monitorDefArray = NULL; BOOL ret = TRUE; WINPR_ASSERT(rdp); @@ -1067,12 +1063,12 @@ static BOOL rdp_recv_monitor_layout_pdu(rdpRdp* rdp, wStream* s) state_run_t rdp_recv_data_pdu(rdpRdp* rdp, wStream* s) { - BYTE type; - wStream* cs; - UINT16 length; - UINT32 shareId; - BYTE compressedType; - UINT16 compressedLength; + BYTE type = 0; + wStream* cs = NULL; + UINT16 length = 0; + UINT32 shareId = 0; + BYTE compressedType = 0; + UINT16 compressedLength = 0; WINPR_ASSERT(rdp); if (!rdp_read_share_data_header(rdp, s, &length, &type, &shareId, &compressedType, @@ -1344,7 +1340,7 @@ state_run_t rdp_recv_message_channel_pdu(rdpRdp* rdp, wStream* s, UINT16 securit state_run_t rdp_recv_out_of_sequence_pdu(rdpRdp* rdp, wStream* s, UINT16 pduType, UINT16 length) { - state_run_t rc; + state_run_t rc = STATE_RUN_FAILED; WINPR_ASSERT(rdp); switch (pduType) @@ -1387,7 +1383,7 @@ BOOL rdp_read_flow_control_pdu(rdpRdp* rdp, wStream* s, UINT16* type, UINT16* ch * However, so far pad8bits has always been observed to arrive AFTER pduTypeFlow. * Switched the order of these two fields to match this observation. */ - UINT8 pduType; + UINT8 pduType = 0; WINPR_ASSERT(rdp); WINPR_ASSERT(s); @@ -1526,7 +1522,7 @@ unlock: const char* pdu_type_to_str(UINT16 pduType, char* buffer, size_t length) { - const char* str; + const char* str = NULL; switch (pduType) { case PDU_TYPE_DEMAND_ACTIVE: @@ -1576,12 +1572,12 @@ const char* pdu_type_to_str(UINT16 pduType, char* buffer, size_t length) static state_run_t rdp_recv_tpkt_pdu(rdpRdp* rdp, wStream* s) { state_run_t rc = STATE_RUN_SUCCESS; - UINT16 length; - UINT16 pduType; - UINT16 pduSource; + UINT16 length = 0; + UINT16 pduType = 0; + UINT16 pduSource = 0; UINT16 channelId = 0; UINT16 securityFlags = 0; - freerdp* instance; + freerdp* instance = NULL; WINPR_ASSERT(rdp); WINPR_ASSERT(rdp->context); @@ -1631,9 +1627,9 @@ static state_run_t rdp_recv_tpkt_pdu(rdpRdp* rdp, wStream* s) while (Stream_GetRemainingLength(s) > 3) { wStream subbuffer; - wStream* sub; - size_t diff; - UINT16 remain; + wStream* sub = NULL; + size_t diff = 0; + UINT16 remain = 0; if (!rdp_read_share_control_header(rdp, s, NULL, &remain, &pduType, &pduSource)) return STATE_RUN_FAILED; @@ -2152,8 +2148,8 @@ BOOL rdp_channel_send_packet(rdpRdp* rdp, UINT16 channelId, size_t totalSize, UI BOOL rdp_send_error_info(rdpRdp* rdp) { - wStream* s; - BOOL status; + wStream* s = NULL; + BOOL status = 0; if (rdp->errorInfo == ERRINFO_SUCCESS) return TRUE; @@ -2170,9 +2166,9 @@ BOOL rdp_send_error_info(rdpRdp* rdp) int rdp_check_fds(rdpRdp* rdp) { - int status; - rdpTsg* tsg; - rdpTransport* transport; + int status = 0; + rdpTsg* tsg = NULL; + rdpTransport* transport = NULL; WINPR_ASSERT(rdp); transport = rdp->transport; @@ -2229,7 +2225,7 @@ BOOL freerdp_get_stats(rdpRdp* rdp, UINT64* inBytes, UINT64* outBytes, UINT64* i rdpRdp* rdp_new(rdpContext* context) { - rdpRdp* rdp; + rdpRdp* rdp = NULL; DWORD flags = 0; rdp = (rdpRdp*)calloc(1, sizeof(rdpRdp)); @@ -2397,8 +2393,8 @@ static void rdp_reset_free(rdpRdp* rdp) BOOL rdp_reset(rdpRdp* rdp) { BOOL rc = TRUE; - rdpContext* context; - rdpSettings* settings; + rdpContext* context = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(rdp); diff --git a/libfreerdp/core/rdstls.c b/libfreerdp/core/rdstls.c index 50e800100..94e09674f 100644 --- a/libfreerdp/core/rdstls.c +++ b/libfreerdp/core/rdstls.c @@ -287,8 +287,8 @@ static BOOL rdstls_write_authentication_response(rdpRdstls* rdstls, wStream* s) static BOOL rdstls_process_capabilities(rdpRdstls* rdstls, wStream* s) { - UINT16 dataType; - UINT16 supportedVersions; + UINT16 dataType = 0; + UINT16 supportedVersions = 0; if (!Stream_CheckAndLogRequiredLengthWLog(rdstls->log, s, 4)) return FALSE; @@ -480,7 +480,7 @@ static BOOL rdstls_process_authentication_request_with_cookie(rdpRdstls* rdstls, static BOOL rdstls_process_authentication_request(rdpRdstls* rdstls, wStream* s) { - UINT16 dataType; + UINT16 dataType = 0; if (!Stream_CheckAndLogRequiredLengthWLog(rdstls->log, s, 2)) return FALSE; @@ -509,8 +509,8 @@ static BOOL rdstls_process_authentication_request(rdpRdstls* rdstls, wStream* s) static BOOL rdstls_process_authentication_response(rdpRdstls* rdstls, wStream* s) { - UINT16 dataType; - UINT32 resultCode; + UINT16 dataType = 0; + UINT32 resultCode = 0; if (!Stream_CheckAndLogRequiredLengthWLog(rdstls->log, s, 6)) return FALSE; @@ -596,8 +596,8 @@ static BOOL rdstls_send(rdpTransport* transport, wStream* s, void* extra) static int rdstls_recv(rdpTransport* transport, wStream* s, void* extra) { - UINT16 version; - UINT16 pduType; + UINT16 version = 0; + UINT16 pduType = 0; rdpRdstls* rdstls = (rdpRdstls*)extra; WINPR_ASSERT(transport); @@ -683,7 +683,7 @@ fail: static BOOL rdstls_recv_authentication_request(rdpRdstls* rdstls) { BOOL rc = FALSE; - int status; + int status = 0; wStream* s = NULL; if (!rdstls_check_state_requirements(rdstls, RDSTLS_STATE_AUTH_REQ)) @@ -733,7 +733,7 @@ fail: static BOOL rdstls_recv_capabilities(rdpRdstls* rdstls) { BOOL rc = FALSE; - int status; + int status = 0; wStream* s = NULL; if (!rdstls_check_state_requirements(rdstls, RDSTLS_STATE_CAPABILITIES)) @@ -783,7 +783,7 @@ fail: static BOOL rdstls_recv_authentication_response(rdpRdstls* rdstls) { BOOL rc = FALSE; - int status; + int status = 0; wStream* s = NULL; WINPR_ASSERT(rdstls); @@ -871,7 +871,7 @@ static SSIZE_T rdstls_parse_pdu_data_type(wLog* log, UINT16 dataType, wStream* s { case RDSTLS_DATA_PASSWORD_CREDS: { - UINT16 redirGuidLength; + UINT16 redirGuidLength = 0; if (Stream_GetRemainingLength(s) < 2) return 0; Stream_Read_UINT16(s, redirGuidLength); @@ -880,7 +880,7 @@ static SSIZE_T rdstls_parse_pdu_data_type(wLog* log, UINT16 dataType, wStream* s return 0; Stream_Seek(s, redirGuidLength); - UINT16 usernameLength; + UINT16 usernameLength = 0; if (Stream_GetRemainingLength(s) < 2) return 0; Stream_Read_UINT16(s, usernameLength); @@ -889,7 +889,7 @@ static SSIZE_T rdstls_parse_pdu_data_type(wLog* log, UINT16 dataType, wStream* s return 0; Stream_Seek(s, usernameLength); - UINT16 domainLength; + UINT16 domainLength = 0; if (Stream_GetRemainingLength(s) < 2) return 0; Stream_Read_UINT16(s, domainLength); @@ -898,7 +898,7 @@ static SSIZE_T rdstls_parse_pdu_data_type(wLog* log, UINT16 dataType, wStream* s return 0; Stream_Seek(s, domainLength); - UINT16 passwordLength; + UINT16 passwordLength = 0; if (Stream_GetRemainingLength(s) < 2) return 0; Stream_Read_UINT16(s, passwordLength); @@ -911,7 +911,7 @@ static SSIZE_T rdstls_parse_pdu_data_type(wLog* log, UINT16 dataType, wStream* s return 0; Stream_Seek(s, 4); - UINT16 cookieLength; + UINT16 cookieLength = 0; if (Stream_GetRemainingLength(s) < 2) return 0; Stream_Read_UINT16(s, cookieLength); @@ -930,7 +930,7 @@ SSIZE_T rdstls_parse_pdu(wLog* log, wStream* stream) wStream sbuffer = { 0 }; wStream* s = Stream_StaticConstInit(&sbuffer, Stream_Buffer(stream), Stream_Length(stream)); - UINT16 version; + UINT16 version = 0; if (Stream_GetRemainingLength(s) < 2) return 0; Stream_Read_UINT16(s, version); @@ -940,7 +940,7 @@ SSIZE_T rdstls_parse_pdu(wLog* log, wStream* stream) return -1; } - UINT16 pduType; + UINT16 pduType = 0; if (Stream_GetRemainingLength(s) < 2) return 0; Stream_Read_UINT16(s, pduType); @@ -952,7 +952,7 @@ SSIZE_T rdstls_parse_pdu(wLog* log, wStream* stream) case RDSTLS_TYPE_AUTHREQ: if (Stream_GetRemainingLength(s) < 2) return 0; - UINT16 dataType; + UINT16 dataType = 0; Stream_Read_UINT16(s, dataType); pduLength = rdstls_parse_pdu_data_type(log, dataType, s); diff --git a/libfreerdp/core/server.c b/libfreerdp/core/server.c index 0c4772f63..015aa3088 100644 --- a/libfreerdp/core/server.c +++ b/libfreerdp/core/server.c @@ -70,8 +70,8 @@ static rdpPeerChannel* wts_get_dvc_channel_by_id(WTSVirtualChannelManager* vcm, static BOOL wts_queue_receive_data(rdpPeerChannel* channel, const BYTE* Buffer, UINT32 Length) { - BYTE* buffer; - wtsChannelMessage* messageCtx; + BYTE* buffer = NULL; + wtsChannelMessage* messageCtx = NULL; WINPR_ASSERT(channel); messageCtx = (wtsChannelMessage*)malloc(sizeof(wtsChannelMessage) + Length); @@ -89,9 +89,9 @@ static BOOL wts_queue_receive_data(rdpPeerChannel* channel, const BYTE* Buffer, static BOOL wts_queue_send_item(rdpPeerChannel* channel, BYTE* Buffer, UINT32 Length) { - BYTE* buffer; - UINT32 length; - UINT16 channelId; + BYTE* buffer = NULL; + UINT32 length = 0; + UINT16 channelId = 0; WINPR_ASSERT(channel); WINPR_ASSERT(channel->vcm); buffer = Buffer; @@ -136,7 +136,7 @@ static int wts_read_variable_uint(wStream* s, int cbLen, UINT32* val) static BOOL wts_read_drdynvc_capabilities_response(rdpPeerChannel* channel, UINT32 length) { - UINT16 Version; + UINT16 Version = 0; WINPR_ASSERT(channel); WINPR_ASSERT(channel->vcm); @@ -164,7 +164,7 @@ static BOOL wts_read_drdynvc_capabilities_response(rdpPeerChannel* channel, UINT static BOOL wts_read_drdynvc_create_response(rdpPeerChannel* channel, wStream* s, UINT32 length) { - UINT32 CreationStatus; + UINT32 CreationStatus = 0; BOOL status = TRUE; WINPR_ASSERT(channel); @@ -198,7 +198,7 @@ static BOOL wts_read_drdynvc_create_response(rdpPeerChannel* channel, wStream* s static BOOL wts_read_drdynvc_data_first(rdpPeerChannel* channel, wStream* s, int cbLen, UINT32 length) { - int value; + int value = 0; WINPR_ASSERT(channel); WINPR_ASSERT(s); value = wts_read_variable_uint(s, cbLen, &channel->dvc_total_length); @@ -264,11 +264,11 @@ static void wts_read_drdynvc_close_response(rdpPeerChannel* channel) static BOOL wts_read_drdynvc_pdu(rdpPeerChannel* channel) { - UINT32 length; - UINT8 value; - UINT8 Cmd; - UINT8 Sp; - UINT8 cbChId; + UINT32 length = 0; + UINT8 value = 0; + UINT8 Cmd = 0; + UINT8 Sp = 0; + UINT8 cbChId = 0; UINT32 ChannelId = 0; rdpPeerChannel* dvc = NULL; @@ -292,7 +292,7 @@ static BOOL wts_read_drdynvc_pdu(rdpPeerChannel* channel) if (channel->vcm->drdynvc_state == DRDYNVC_STATE_READY) { - BOOL haveChannelId; + BOOL haveChannelId = 0; switch (Cmd) { case SOFT_SYNC_REQUEST_PDU: @@ -384,7 +384,7 @@ static BOOL wts_read_drdynvc_pdu(rdpPeerChannel* channel) static int wts_write_variable_uint(wStream* s, UINT32 val) { - int cb; + int cb = 0; WINPR_ASSERT(s); if (val <= 0xFF) @@ -408,8 +408,8 @@ static int wts_write_variable_uint(wStream* s, UINT32 val) static void wts_write_drdynvc_header(wStream* s, BYTE Cmd, UINT32 ChannelId) { - BYTE* bm; - int cbChId; + BYTE* bm = NULL; + int cbChId = 0; WINPR_ASSERT(s); @@ -421,7 +421,7 @@ static void wts_write_drdynvc_header(wStream* s, BYTE Cmd, UINT32 ChannelId) static BOOL wts_write_drdynvc_create_request(wStream* s, UINT32 ChannelId, const char* ChannelName) { - size_t len; + size_t len = 0; WINPR_ASSERT(s); WINPR_ASSERT(ChannelName); @@ -483,8 +483,8 @@ static BOOL WTSProcessChannelData(rdpPeerChannel* channel, UINT16 channelId, con static BOOL WTSReceiveChannelData(freerdp_peer* client, UINT16 channelId, const BYTE* data, size_t size, UINT32 flags, size_t totalSize) { - UINT32 i; - rdpMcs* mcs; + UINT32 i = 0; + rdpMcs* mcs = NULL; WINPR_ASSERT(client); WINPR_ASSERT(client->context); @@ -513,7 +513,7 @@ static BOOL WTSReceiveChannelData(freerdp_peer* client, UINT16 channelId, const #if defined(WITH_FREERDP_DEPRECATED) void WTSVirtualChannelManagerGetFileDescriptor(HANDLE hServer, void** fds, int* fds_count) { - void* fd; + void* fd = NULL; WTSVirtualChannelManager* vcm = (WTSVirtualChannelManager*)hServer; WINPR_ASSERT(vcm); WINPR_ASSERT(fds); @@ -553,7 +553,7 @@ BOOL WTSVirtualChannelManagerOpen(HANDLE hServer) if (vcm->drdynvc_state == DRDYNVC_STATE_NONE) { - rdpPeerChannel* channel; + rdpPeerChannel* channel = NULL; /* Initialize drdynvc channel once and only once. */ vcm->drdynvc_state = DRDYNVC_STATE_INITIALIZED; @@ -574,7 +574,7 @@ BOOL WTSVirtualChannelManagerOpen(HANDLE hServer) /* TODO: shall implement version 2 and 3 */ - ULONG written; + ULONG written = 0; if (!WTSVirtualChannelWrite(channel, (PCHAR)capaBuffer, Stream_GetPosition(s), &written)) return FALSE; @@ -603,9 +603,9 @@ BOOL WTSVirtualChannelManagerCheckFileDescriptorEx(HANDLE hServer, BOOL autoOpen while (MessageQueue_Peek(vcm->queue, &message, TRUE)) { - BYTE* buffer; - UINT32 length; - UINT16 channelId; + BYTE* buffer = NULL; + UINT32 length = 0; + UINT16 channelId = 0; channelId = (UINT16)(UINT_PTR)message.context; buffer = (BYTE*)message.wParam; length = (UINT32)(UINT_PTR)message.lParam; @@ -640,7 +640,7 @@ HANDLE WTSVirtualChannelManagerGetEventHandle(HANDLE hServer) static rdpMcsChannel* wts_get_joined_channel_by_name(rdpMcs* mcs, const char* channel_name) { - UINT32 index; + UINT32 index = 0; if (!mcs || !channel_name || !strnlen(channel_name, CHANNEL_NAME_LEN + 1)) return NULL; @@ -660,7 +660,7 @@ static rdpMcsChannel* wts_get_joined_channel_by_name(rdpMcs* mcs, const char* ch static rdpMcsChannel* wts_get_joined_channel_by_id(rdpMcs* mcs, const UINT16 channel_id) { - UINT32 index; + UINT32 index = 0; if (!mcs || !channel_id) return NULL; @@ -727,7 +727,7 @@ void WTSVirtualChannelManagerSetDVCCreationCallback(HANDLE hServer, psDVCCreatio UINT16 WTSChannelGetId(freerdp_peer* client, const char* channel_name) { - rdpMcsChannel* channel; + rdpMcsChannel* channel = NULL; WINPR_ASSERT(channel_name); if (!client || !client->context || !client->context->rdp) @@ -752,7 +752,7 @@ UINT32 WTSChannelGetIdByHandle(HANDLE hChannelHandle) BOOL WTSChannelSetHandleByName(freerdp_peer* client, const char* channel_name, void* handle) { - rdpMcsChannel* channel; + rdpMcsChannel* channel = NULL; WINPR_ASSERT(channel_name); if (!client || !client->context || !client->context->rdp) @@ -769,7 +769,7 @@ BOOL WTSChannelSetHandleByName(freerdp_peer* client, const char* channel_name, v BOOL WTSChannelSetHandleById(freerdp_peer* client, const UINT16 channel_id, void* handle) { - rdpMcsChannel* channel; + rdpMcsChannel* channel = NULL; if (!client || !client->context || !client->context->rdp) return FALSE; @@ -785,7 +785,7 @@ BOOL WTSChannelSetHandleById(freerdp_peer* client, const UINT16 channel_id, void void* WTSChannelGetHandleByName(freerdp_peer* client, const char* channel_name) { - rdpMcsChannel* channel; + rdpMcsChannel* channel = NULL; WINPR_ASSERT(channel_name); if (!client || !client->context || !client->context->rdp) @@ -801,7 +801,7 @@ void* WTSChannelGetHandleByName(freerdp_peer* client, const char* channel_name) void* WTSChannelGetHandleById(freerdp_peer* client, const UINT16 channel_id) { - rdpMcsChannel* channel; + rdpMcsChannel* channel = NULL; if (!client || !client->context || !client->context->rdp) return NULL; @@ -816,7 +816,7 @@ void* WTSChannelGetHandleById(freerdp_peer* client, const UINT16 channel_id) const char* WTSChannelGetName(freerdp_peer* client, UINT16 channel_id) { - rdpMcsChannel* channel; + rdpMcsChannel* channel = NULL; if (!client || !client->context || !client->context->rdp) return NULL; @@ -831,9 +831,9 @@ const char* WTSChannelGetName(freerdp_peer* client, UINT16 channel_id) char** WTSGetAcceptedChannelNames(freerdp_peer* client, size_t* count) { - rdpMcs* mcs; - char** names; - UINT32 index; + rdpMcs* mcs = NULL; + char** names = NULL; + UINT32 index = 0; if (!client || !client->context || !count) return NULL; @@ -858,7 +858,7 @@ char** WTSGetAcceptedChannelNames(freerdp_peer* client, size_t* count) INT64 WTSChannelGetOptions(freerdp_peer* client, UINT16 channel_id) { - rdpMcsChannel* channel; + rdpMcsChannel* channel = NULL; if (!client || !client->context || !client->context->rdp) return -1; @@ -970,9 +970,9 @@ static UINT32 channelId_Hash(const void* key) HANDLE WINAPI FreeRDP_WTSOpenServerA(LPSTR pServerName) { - rdpContext* context; - freerdp_peer* client; - WTSVirtualChannelManager* vcm; + rdpContext* context = NULL; + freerdp_peer* client = NULL; + WTSVirtualChannelManager* vcm = NULL; HANDLE hServer = INVALID_HANDLE_VALUE; wObject queueCallbacks = { 0 }; @@ -1061,7 +1061,7 @@ HANDLE WINAPI FreeRDP_WTSOpenServerExA(LPSTR pServerName) VOID WINAPI FreeRDP_WTSCloseServer(HANDLE hServer) { - WTSVirtualChannelManager* vcm; + WTSVirtualChannelManager* vcm = NULL; vcm = (WTSVirtualChannelManager*)hServer; if (vcm && (vcm != INVALID_HANDLE_VALUE)) @@ -1133,8 +1133,8 @@ BOOL WINAPI FreeRDP_WTSQuerySessionInformationA(HANDLE hServer, DWORD SessionId, WTS_INFO_CLASS WTSInfoClass, LPSTR* ppBuffer, DWORD* pBytesReturned) { - DWORD BytesReturned; - WTSVirtualChannelManager* vcm; + DWORD BytesReturned = 0; + WTSVirtualChannelManager* vcm = NULL; vcm = (WTSVirtualChannelManager*)hServer; if (!vcm) @@ -1142,7 +1142,7 @@ BOOL WINAPI FreeRDP_WTSQuerySessionInformationA(HANDLE hServer, DWORD SessionId, if (WTSInfoClass == WTSSessionId) { - ULONG* pBuffer; + ULONG* pBuffer = NULL; BytesReturned = sizeof(ULONG); pBuffer = (ULONG*)malloc(sizeof(BytesReturned)); @@ -1262,15 +1262,15 @@ fail: HANDLE WINAPI FreeRDP_WTSVirtualChannelOpen(HANDLE hServer, DWORD SessionId, LPSTR pVirtualName) { - size_t length; - UINT32 index; - rdpMcs* mcs; + size_t length = 0; + UINT32 index = 0; + rdpMcs* mcs = NULL; rdpMcsChannel* joined_channel = NULL; - freerdp_peer* client; + freerdp_peer* client = NULL; rdpPeerChannel* channel = NULL; - WTSVirtualChannelManager* vcm; + WTSVirtualChannelManager* vcm = NULL; HANDLE hChannelHandle = NULL; - rdpContext* context; + rdpContext* context = NULL; vcm = (WTSVirtualChannelManager*)hServer; if (!vcm) @@ -1339,13 +1339,13 @@ fail: HANDLE WINAPI FreeRDP_WTSVirtualChannelOpenEx(DWORD SessionId, LPSTR pVirtualName, DWORD flags) { - UINT32 index; + UINT32 index = 0; wStream* s = NULL; - rdpMcs* mcs; + rdpMcs* mcs = NULL; BOOL joined = FALSE; - freerdp_peer* client; + freerdp_peer* client = NULL; rdpPeerChannel* channel = NULL; - ULONG written; + ULONG written = 0; WTSVirtualChannelManager* vcm = NULL; if (SessionId == WTS_CURRENT_SESSION) @@ -1435,8 +1435,8 @@ fail: BOOL WINAPI FreeRDP_WTSVirtualChannelClose(HANDLE hChannelHandle) { - wStream* s; - rdpMcs* mcs; + wStream* s = NULL; + rdpMcs* mcs = NULL; rdpPeerChannel* channel = (rdpPeerChannel*)hChannelHandle; BOOL ret = TRUE; @@ -1465,7 +1465,7 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelClose(HANDLE hChannelHandle) { if (channel->dvc_open_state == DVC_OPEN_STATE_SUCCEEDED) { - ULONG written; + ULONG written = 0; s = Stream_New(NULL, 8); if (!s) @@ -1536,13 +1536,13 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelRead(HANDLE hChannelHandle, ULONG TimeOut, BOOL WINAPI FreeRDP_WTSVirtualChannelWrite(HANDLE hChannelHandle, PCHAR Buffer, ULONG Length, PULONG pBytesWritten) { - wStream* s; - int cbLen; - int cbChId; - int first; - BYTE* buffer; - UINT32 length; - UINT32 written; + wStream* s = NULL; + int cbLen = 0; + int cbChId = 0; + int first = 0; + BYTE* buffer = NULL; + UINT32 length = 0; + UINT32 written = 0; UINT32 totalWritten = 0; rdpPeerChannel* channel = (rdpPeerChannel*)hChannelHandle; BOOL ret = FALSE; @@ -1574,7 +1574,7 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelWrite(HANDLE hChannelHandle, PCHAR Buffer, } else { - rdpContext* context; + rdpContext* context = NULL; first = TRUE; WINPR_ASSERT(channel->client); @@ -1644,10 +1644,10 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelPurgeOutput(HANDLE hChannelHandle) BOOL WINAPI FreeRDP_WTSVirtualChannelQuery(HANDLE hChannelHandle, WTS_VIRTUAL_CLASS WtsVirtualClass, PVOID* ppBuffer, DWORD* pBytesReturned) { - void* pfd; - BOOL bval; + void* pfd = NULL; + BOOL bval = 0; void* fds[10] = { 0 }; - HANDLE hEvent; + HANDLE hEvent = NULL; int fds_count = 0; BOOL status = FALSE; rdpPeerChannel* channel = (rdpPeerChannel*)hChannelHandle; diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c index db6bc13fc..060a24607 100644 --- a/libfreerdp/core/settings.c +++ b/libfreerdp/core/settings.c @@ -59,8 +59,8 @@ static const char client_dll[] = "C:\\Windows\\System32\\mstscax.dll"; static BOOL settings_reg_query_dword_val(HKEY hKey, const TCHAR* sub, DWORD* value) { - DWORD dwType; - DWORD dwSize; + DWORD dwType = 0; + DWORD dwSize = 0; dwSize = sizeof(DWORD); if (RegQueryValueEx(hKey, sub, NULL, &dwType, (BYTE*)value, &dwSize) != ERROR_SUCCESS) @@ -73,7 +73,7 @@ static BOOL settings_reg_query_dword_val(HKEY hKey, const TCHAR* sub, DWORD* val static BOOL settings_reg_query_word_val(HKEY hKey, const TCHAR* sub, UINT16* value) { - DWORD dwValue; + DWORD dwValue = 0; if (!settings_reg_query_dword_val(hKey, sub, &dwValue)) return FALSE; @@ -87,7 +87,7 @@ static BOOL settings_reg_query_word_val(HKEY hKey, const TCHAR* sub, UINT16* val static BOOL settings_reg_query_bool_val(HKEY hKey, const TCHAR* sub, BOOL* value) { - DWORD dwValue; + DWORD dwValue = 0; if (!settings_reg_query_dword_val(hKey, sub, &dwValue)) return FALSE; @@ -98,7 +98,7 @@ static BOOL settings_reg_query_bool_val(HKEY hKey, const TCHAR* sub, BOOL* value static BOOL settings_reg_query_dword(rdpSettings* settings, FreeRDP_Settings_Keys_UInt32 id, HKEY hKey, const TCHAR* sub) { - DWORD dwValue; + DWORD dwValue = 0; if (!settings_reg_query_dword_val(hKey, sub, &dwValue)) return FALSE; @@ -109,7 +109,7 @@ static BOOL settings_reg_query_dword(rdpSettings* settings, FreeRDP_Settings_Key static BOOL settings_reg_query_bool(rdpSettings* settings, FreeRDP_Settings_Keys_Bool id, HKEY hKey, const TCHAR* sub) { - DWORD dwValue; + DWORD dwValue = 0; if (!settings_reg_query_dword_val(hKey, sub, &dwValue)) return FALSE; @@ -119,8 +119,8 @@ static BOOL settings_reg_query_bool(rdpSettings* settings, FreeRDP_Settings_Keys static void settings_client_load_hkey_local_machine(rdpSettings* settings) { - HKEY hKey; - LONG status; + HKEY hKey = NULL; + LONG status = 0; status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, CLIENT_KEY, 0, KEY_READ | KEY_WOW64_64KEY, &hKey); if (status == ERROR_SUCCESS) @@ -155,12 +155,12 @@ static void settings_client_load_hkey_local_machine(rdpSettings* settings) if (status == ERROR_SUCCESS) { - unsigned x; + unsigned x = 0; settings_reg_query_dword(settings, FreeRDP_BitmapCacheV2NumCells, hKey, _T("NumCells")); for (x = 0; x < 5; x++) { - DWORD val; + DWORD val = 0; TCHAR numentries[64] = { 0 }; TCHAR persist[64] = { 0 }; BITMAP_CACHE_V2_CELL_INFO cache = { 0 }; @@ -184,7 +184,7 @@ static void settings_client_load_hkey_local_machine(rdpSettings* settings) if (status == ERROR_SUCCESS) { - unsigned x; + unsigned x = 0; UINT32 GlyphSupportLevel = 0; settings_reg_query_dword(settings, FreeRDP_GlyphSupportLevel, hKey, _T("SupportLevel")); for (x = 0; x < 10; x++) @@ -230,8 +230,8 @@ static void settings_client_load_hkey_local_machine(rdpSettings* settings) static void settings_server_load_hkey_local_machine(rdpSettings* settings) { - HKEY hKey; - LONG status; + HKEY hKey = NULL; + LONG status = 0; status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, SERVER_KEY, 0, KEY_READ | KEY_WOW64_64KEY, &hKey); @@ -355,7 +355,7 @@ BOOL freerdp_capability_buffer_allocate(rdpSettings* settings, UINT32 count) rdpSettings* freerdp_settings_new(DWORD flags) { - char* base; + char* base = NULL; char* issuers[] = { "FreeRDP", "FreeRDP-licenser" }; const BOOL server = (flags & FREERDP_SETTINGS_SERVER_MODE) != 0 ? TRUE : FALSE; const BOOL remote = (flags & FREERDP_SETTINGS_REMOTE_MODE) != 0 ? TRUE : FALSE; @@ -706,8 +706,8 @@ rdpSettings* freerdp_settings_new(DWORD flags) if (!freerdp_settings_get_bool(settings, FreeRDP_ServerMode)) { - BOOL rc; - char* path; + BOOL rc = 0; + char* path = NULL; if (!freerdp_settings_set_bool(settings, FreeRDP_RedirectClipboard, TRUE)) goto out_fail; /* these values are used only by the client part */ @@ -739,9 +739,9 @@ rdpSettings* freerdp_settings_new(DWORD flags) } else { - BOOL res; - size_t i; - char* cpath; + BOOL res = 0; + size_t i = 0; + char* cpath = NULL; char product[sizeof(FREERDP_PRODUCT_STRING)] = { 0 }; for (i = 0; i < sizeof(product); i++) @@ -826,7 +826,7 @@ void freerdp_settings_free(rdpSettings* settings) static BOOL freerdp_settings_int_buffer_copy(rdpSettings* _settings, const rdpSettings* settings) { BOOL rc = FALSE; - UINT32 index; + UINT32 index = 0; if (!_settings || !settings) return FALSE; @@ -1066,7 +1066,7 @@ out_fail: BOOL freerdp_settings_copy(rdpSettings* _settings, const rdpSettings* settings) { - BOOL rc; + BOOL rc = 0; if (!settings || !_settings) return FALSE; diff --git a/libfreerdp/core/smartcardlogon.c b/libfreerdp/core/smartcardlogon.c index 5ed74a1cb..db09e7541 100644 --- a/libfreerdp/core/smartcardlogon.c +++ b/libfreerdp/core/smartcardlogon.c @@ -164,7 +164,7 @@ static BOOL treat_sc_cert(SmartcardCertInfo* scCert) if (scCert->upn) { - size_t userLen; + size_t userLen = 0; const char* atPos = strchr(scCert->upn, '@'); if (!atPos) @@ -392,10 +392,10 @@ static BOOL list_provider_keys(const rdpSettings* settings, NCRYPT_PROV_HANDLE p NCRYPT_KEY_HANDLE phKey = 0; PBYTE certBytes = NULL; DWORD dwFlags = NCRYPT_SILENT_FLAG; - DWORD cbOutput; + DWORD cbOutput = 0; SmartcardCertInfo* cert = NULL; BOOL haveError = TRUE; - SECURITY_STATUS status; + SECURITY_STATUS status = 0; cert = calloc(1, sizeof(SmartcardCertInfo)); if (!cert) @@ -559,8 +559,8 @@ static BOOL smartcard_hw_enumerateCerts(const rdpSettings* settings, LPCWSTR csp { BOOL ret = FALSE; LPWSTR scope = NULL; - NCRYPT_PROV_HANDLE provider; - SECURITY_STATUS status; + NCRYPT_PROV_HANDLE provider = 0; + SECURITY_STATUS status = 0; size_t count = 0; SmartcardCertInfo** cert_list = NULL; const char* Pkcs11Module = freerdp_settings_get_string(settings, FreeRDP_Pkcs11Module); @@ -610,8 +610,8 @@ static BOOL smartcard_hw_enumerateCerts(const rdpSettings* settings, LPCWSTR csp else { NCryptProviderName* names = NULL; - DWORD nproviders; - DWORD i; + DWORD nproviders = 0; + DWORD i = 0; #ifdef _WIN32 /* On Windows, mstsc first enumerates the legacy CAPI providers for usable certificates. */ @@ -703,8 +703,8 @@ out: static char* create_temporary_file(void) { BYTE buffer[32]; - char* hex; - char* path; + char* hex = NULL; + char* path = NULL; winpr_RAND(buffer, sizeof(buffer)); hex = winpr_BinToHexString(buffer, sizeof(buffer), FALSE); @@ -821,12 +821,12 @@ out_error: BOOL smartcard_enumerateCerts(const rdpSettings* settings, SmartcardCertInfo*** scCerts, size_t* retCount, BOOL gateway) { - BOOL ret; + BOOL ret = 0; LPWSTR csp = NULL; const char* ReaderName = freerdp_settings_get_string(settings, FreeRDP_ReaderName); const char* CspName = freerdp_settings_get_string(settings, FreeRDP_CspName); - const char* Username; - const char* Domain; + const char* Username = NULL; + const char* Domain = NULL; if (gateway) { @@ -879,7 +879,7 @@ BOOL smartcard_getCert(const rdpContext* context, SmartcardCertInfo** cert, BOOL const freerdp* instance = context->instance; rdpSettings* settings = context->settings; - SmartcardCertInfo** cert_list; + SmartcardCertInfo** cert_list = NULL; size_t count = 0; WINPR_ASSERT(instance); diff --git a/libfreerdp/core/state.c b/libfreerdp/core/state.c index e4ca138b9..7054e5182 100644 --- a/libfreerdp/core/state.c +++ b/libfreerdp/core/state.c @@ -44,7 +44,7 @@ BOOL state_run_success(state_run_t status) const char* state_run_result_string(state_run_t status, char* buffer, size_t buffersize) { - const char* name; + const char* name = NULL; switch (status) { diff --git a/libfreerdp/core/streamdump.c b/libfreerdp/core/streamdump.c index 7a0649c6f..ec54f1fe5 100644 --- a/libfreerdp/core/streamdump.c +++ b/libfreerdp/core/streamdump.c @@ -44,7 +44,7 @@ struct stream_dump_context static UINT32 crc32b(const BYTE* data, size_t length) { - size_t x; + size_t x = 0; UINT32 crc = 0xFFFFFFFF; for (x = 0; x < length; x++) @@ -67,11 +67,11 @@ static stream_dump_read_line(FILE* fp, wStream* s, UINT64* pts, size_t* pOffset, UINT32* flags) { BOOL rc = FALSE; - UINT64 ts; + UINT64 ts = 0; UINT64 size = 0; - size_t r; - UINT32 crc32; - BYTE received; + size_t r = 0; + UINT32 crc32 = 0; + BYTE received = 0; if (!fp || !s || !flags) return FALSE; @@ -162,7 +162,7 @@ fail: static FILE* stream_dump_get_file(const rdpSettings* settings, const char* mode) { - const char* cfolder; + const char* cfolder = NULL; char* file = NULL; FILE* fp = NULL; @@ -190,7 +190,7 @@ SSIZE_T stream_dump_append(const rdpContext* context, UINT32 flags, wStream* s, FILE* fp = NULL; const UINT32 mask = STREAM_MSG_SRV_RX | STREAM_MSG_SRV_TX; CONNECTION_STATE state = freerdp_get_state(context); - int r; + int r = 0; if (!context || !s || !offset) return -1; @@ -229,7 +229,7 @@ SSIZE_T stream_dump_get(const rdpContext* context, UINT32* flags, wStream* s, si { SSIZE_T rc = -1; FILE* fp = NULL; - int r; + int r = 0; if (!context || !s || !offset) return -1; @@ -252,7 +252,7 @@ fail: static int stream_dump_transport_write(rdpTransport* transport, wStream* s) { - SSIZE_T r; + SSIZE_T r = 0; rdpContext* ctx = transport_get_context(transport); WINPR_ASSERT(ctx); @@ -270,7 +270,7 @@ static int stream_dump_transport_write(rdpTransport* transport, wStream* s) static int stream_dump_transport_read(rdpTransport* transport, wStream* s) { - int rc; + int rc = 0; rdpContext* ctx = transport_get_context(transport); WINPR_ASSERT(ctx); @@ -315,7 +315,7 @@ static BOOL stream_dump_register_write_handlers(rdpContext* context) static int stream_dump_replay_transport_write(rdpTransport* transport, wStream* s) { rdpContext* ctx = transport_get_context(transport); - size_t size; + size_t size = 0; WINPR_ASSERT(ctx); WINPR_ASSERT(s); diff --git a/libfreerdp/core/surface.c b/libfreerdp/core/surface.c index 393e4149a..43256f87a 100644 --- a/libfreerdp/core/surface.c +++ b/libfreerdp/core/surface.c @@ -197,7 +197,7 @@ static BOOL update_recv_surfcmd_frame_marker(rdpUpdate* update, wStream* s) int update_recv_surfcmds(rdpUpdate* update, wStream* s) { - UINT16 cmdType; + UINT16 cmdType = 0; rdp_update_internal* up = update_cast(update); WINPR_ASSERT(s); @@ -293,7 +293,7 @@ static BOOL update_write_surfcmd_bitmap_ex(wStream* s, const TS_BITMAP_DATA_EX* BOOL update_write_surfcmd_surface_bits(wStream* s, const SURFACE_BITS_COMMAND* cmd) { - UINT16 cmdType; + UINT16 cmdType = 0; if (!Stream_EnsureRemainingCapacity(s, SURFCMD_SURFACE_BITS_HEADER_LENGTH)) return FALSE; diff --git a/libfreerdp/core/tcp.c b/libfreerdp/core/tcp.c index 3e7fc0d16..48545075a 100644 --- a/libfreerdp/core/tcp.c +++ b/libfreerdp/core/tcp.c @@ -111,7 +111,7 @@ static long transport_bio_simple_callback(BIO* bio, int mode, const char* argp, static int transport_bio_simple_write(BIO* bio, const char* buf, int size) { - int error; + int error = 0; int status = 0; WINPR_BIO_SIMPLE_SOCKET* ptr = (WINPR_BIO_SIMPLE_SOCKET*)BIO_get_data(bio); @@ -141,7 +141,7 @@ static int transport_bio_simple_write(BIO* bio, const char* buf, int size) static int transport_bio_simple_read(BIO* bio, char* buf, int size) { - int error; + int error = 0; int status = 0; WINPR_BIO_SIMPLE_SOCKET* ptr = (WINPR_BIO_SIMPLE_SOCKET*)BIO_get_data(bio); @@ -214,7 +214,7 @@ static long transport_bio_simple_ctrl(BIO* bio, int cmd, long arg1, void* arg2) case BIO_C_SET_NONBLOCK: { #ifndef _WIN32 - int flags; + int flags = 0; flags = fcntl((int)ptr->socket, F_GETFL); if (flags == -1) @@ -401,7 +401,7 @@ static int transport_bio_simple_uninit(BIO* bio) static int transport_bio_simple_new(BIO* bio) { - WINPR_BIO_SIMPLE_SOCKET* ptr; + WINPR_BIO_SIMPLE_SOCKET* ptr = NULL; BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); ptr = (WINPR_BIO_SIMPLE_SOCKET*)calloc(1, sizeof(WINPR_BIO_SIMPLE_SOCKET)); @@ -414,7 +414,7 @@ static int transport_bio_simple_new(BIO* bio) static int transport_bio_simple_free(BIO* bio) { - WINPR_BIO_SIMPLE_SOCKET* ptr; + WINPR_BIO_SIMPLE_SOCKET* ptr = NULL; if (!bio) return 0; @@ -534,7 +534,7 @@ out: static int transport_bio_buffered_read(BIO* bio, char* buf, int size) { - int status; + int status = 0; WINPR_BIO_BUFFERED_SOCKET* ptr = (WINPR_BIO_BUFFERED_SOCKET*)BIO_get_data(bio); BIO* next_bio = BIO_next(bio); ptr->readBlocked = FALSE; @@ -615,7 +615,7 @@ static long transport_bio_buffered_ctrl(BIO* bio, int cmd, long arg1, void* arg2 static int transport_bio_buffered_new(BIO* bio) { - WINPR_BIO_BUFFERED_SOCKET* ptr; + WINPR_BIO_BUFFERED_SOCKET* ptr = NULL; BIO_set_init(bio, 1); BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); ptr = (WINPR_BIO_BUFFERED_SOCKET*)calloc(1, sizeof(WINPR_BIO_BUFFERED_SOCKET)); @@ -739,8 +739,8 @@ char* freerdp_tcp_get_peer_address(SOCKET sockfd) static int freerdp_uds_connect(const char* path) { #ifndef _WIN32 - int status; - int sockfd; + int status = 0; + int sockfd = 0; struct sockaddr_un addr = { 0 }; sockfd = socket(AF_UNIX, SOCK_STREAM, 0); @@ -771,7 +771,7 @@ struct addrinfo* freerdp_tcp_resolve_host(const char* hostname, int port, int ai { char* service = NULL; char port_str[16]; - int status; + int status = 0; struct addrinfo hints = { 0 }; struct addrinfo* result = NULL; hints.ai_family = AF_UNSPEC; @@ -899,14 +899,14 @@ static void peer_free(t_peer* peer) static int freerdp_tcp_connect_multi(rdpContext* context, char** hostnames, UINT32* ports, UINT32 count, UINT16 port, UINT32 timeout) { - UINT32 index; + UINT32 index = 0; UINT32 sindex = count; int status = -1; SOCKET sockfd = INVALID_SOCKET; - HANDLE* events; - struct addrinfo* addr; - struct addrinfo* result; - t_peer* peers; + HANDLE* events = NULL; + struct addrinfo* addr = NULL; + struct addrinfo* result = NULL; + t_peer* peers = NULL; events = (HANDLE*)calloc(count + 1, sizeof(HANDLE)); peers = (t_peer*)calloc(count, sizeof(t_peer)); @@ -993,8 +993,8 @@ static int freerdp_tcp_connect_multi(rdpContext* context, char** hostnames, UINT BOOL freerdp_tcp_set_keep_alive_mode(const rdpSettings* settings, int sockfd) { const BOOL keepalive = (freerdp_settings_get_bool(settings, FreeRDP_TcpKeepAlive)); - UINT32 optval; - socklen_t optlen; + UINT32 optval = 0; + socklen_t optlen = 0; optval = keepalive ? 1 : 0; optlen = sizeof(optval); @@ -1064,7 +1064,7 @@ BOOL freerdp_tcp_set_keep_alive_mode(const rdpSettings* settings, int sockfd) int freerdp_tcp_connect(rdpContext* context, const char* hostname, int port, DWORD timeout) { - rdpTransport* transport; + rdpTransport* transport = NULL; if (!context || !context->rdp) return -1; transport = context->rdp->transport; @@ -1076,9 +1076,9 @@ int freerdp_tcp_connect(rdpContext* context, const char* hostname, int port, DWO int freerdp_tcp_default_connect(rdpContext* context, rdpSettings* settings, const char* hostname, int port, DWORD timeout) { - int sockfd; - UINT32 optval; - socklen_t optlen; + int sockfd = 0; + UINT32 optval = 0; + socklen_t optlen = 0; BOOL ipcSocket = FALSE; BOOL useExternalDefinedSocket = FALSE; @@ -1164,9 +1164,9 @@ int freerdp_tcp_default_connect(rdpContext* context, rdpSettings* settings, cons if (sockfd <= 0) { - char* peerAddress; - struct addrinfo* addr; - struct addrinfo* result; + char* peerAddress = NULL; + struct addrinfo* addr = NULL; + struct addrinfo* result = NULL; result = freerdp_tcp_resolve_host(hostname, port, 0); diff --git a/libfreerdp/core/test/TestConnect.c b/libfreerdp/core/test/TestConnect.c index affb81c59..7fd42ddc3 100644 --- a/libfreerdp/core/test/TestConnect.c +++ b/libfreerdp/core/test/TestConnect.c @@ -13,7 +13,7 @@ static int runInstance(int argc, char* argv[], freerdp** inst, DWORD timeout) { int rc = -1; RDP_CLIENT_ENTRY_POINTS clientEntryPoints = { 0 }; - rdpContext* context; + rdpContext* context = NULL; clientEntryPoints.Size = sizeof(RDP_CLIENT_ENTRY_POINTS); clientEntryPoints.Version = RDP_CLIENT_INTERFACE_VERSION; @@ -72,12 +72,12 @@ finish: static int testTimeout(int port) { const DWORD timeout = 200; - DWORD start; - DWORD end; - DWORD diff; + DWORD start = 0; + DWORD end = 0; + DWORD diff = 0; char arg1[] = "/v:192.0.2.1:XXXXX"; char* argv[] = { "test", "/v:192.0.2.1:XXXXX" }; - int rc; + int rc = 0; _snprintf(arg1, 18, "/v:192.0.2.1:%d", port); argv[1] = arg1; start = GetTickCount(); @@ -109,7 +109,7 @@ static DWORD WINAPI testThread(LPVOID arg) { char arg1[] = "/v:192.0.2.1:XXXXX"; char* argv[] = { "test", "/v:192.0.2.1:XXXXX" }; - int rc; + int rc = 0; struct testThreadArgs* args = arg; _snprintf(arg1, 18, "/v:192.0.2.1:%d", args->port); argv[1] = arg1; @@ -124,11 +124,11 @@ static DWORD WINAPI testThread(LPVOID arg) static int testAbort(int port) { - DWORD status; - DWORD start; - DWORD end; - DWORD diff; - HANDLE thread; + DWORD status = 0; + DWORD start = 0; + DWORD end = 0; + DWORD diff = 0; + HANDLE thread = NULL; struct testThreadArgs args; freerdp* instance = NULL; s_sync = CreateEvent(NULL, TRUE, FALSE, NULL); @@ -185,8 +185,8 @@ static int testAbort(int port) static char* concatenate(size_t count, ...) { - size_t x; - char* rc; + size_t x = 0; + char* rc = NULL; va_list ap; va_start(ap, count); rc = _strdup(va_arg(ap, char*)); @@ -205,7 +205,7 @@ static BOOL prepare_certificates(const char* path) { BOOL rc = FALSE; char* exe = NULL; - DWORD status; + DWORD status = 0; STARTUPINFOA si = { 0 }; SECURITY_ATTRIBUTES saAttr = { 0 }; PROCESS_INFORMATION process = { 0 }; @@ -239,14 +239,14 @@ fail: static int testSuccess(int port) { - int r; + int r = 0; int rc = -2; STARTUPINFOA si = { 0 }; PROCESS_INFORMATION process = { 0 }; char arg1[] = "/v:127.0.0.1:XXXXX"; char* clientArgs[] = { "test", "/v:127.0.0.1:XXXXX", "/cert:ignore", "/rfx", NULL }; char* commandLine = NULL; - size_t commandLineLen; + size_t commandLineLen = 0; int argc = 4; char* path = NULL; char* wpath = NULL; @@ -317,8 +317,8 @@ fail: int TestConnect(int argc, char* argv[]) { - int randomPort; - int random; + int randomPort = 0; + int random = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); winpr_RAND(&random, sizeof(random)); diff --git a/libfreerdp/core/test/TestSettings.c b/libfreerdp/core/test/TestSettings.c index c6eb38605..1d68f4711 100644 --- a/libfreerdp/core/test/TestSettings.c +++ b/libfreerdp/core/test/TestSettings.c @@ -15,7 +15,7 @@ static BOOL log_result(BOOL value, const char* fkt) static BOOL compare(const ADDIN_ARGV* got, const ADDIN_ARGV* expect) { - int x; + int x = 0; BOOL rc = TRUE; if (!got && expect) return FALSE; @@ -35,16 +35,16 @@ static BOOL compare(const ADDIN_ARGV* got, const ADDIN_ARGV* expect) static BOOL test_dyn_channels(void) { BOOL rc = FALSE; - BOOL test; - UINT32 u32; + BOOL test = 0; + UINT32 u32 = 0; rdpSettings* settings = freerdp_settings_new(0); const char* argv1[] = { "foobar" }; ADDIN_ARGV* args1 = NULL; - const ADDIN_ARGV* cmp1; + const ADDIN_ARGV* cmp1 = NULL; const char* argv2[] = { "gaga", "abba", "foo" }; ADDIN_ARGV* args2 = NULL; - const ADDIN_ARGV* cmp2; - const ADDIN_ARGV* got; + const ADDIN_ARGV* cmp2 = NULL; + const ADDIN_ARGV* got = NULL; if (!settings) goto fail; @@ -135,16 +135,16 @@ fail: static BOOL test_static_channels(void) { BOOL rc = FALSE; - BOOL test; - UINT32 u32; + BOOL test = 0; + UINT32 u32 = 0; rdpSettings* settings = freerdp_settings_new(0); const char* argv1[] = { "foobar" }; ADDIN_ARGV* args1 = NULL; - const ADDIN_ARGV* cmp1; + const ADDIN_ARGV* cmp1 = NULL; const char* argv2[] = { "gaga", "abba", "foo" }; ADDIN_ARGV* args2 = NULL; - const ADDIN_ARGV* cmp2; - const ADDIN_ARGV* got; + const ADDIN_ARGV* cmp2 = NULL; + const ADDIN_ARGV* got = NULL; if (!settings) goto fail; @@ -261,7 +261,7 @@ fail: static BOOL test_helpers(void) { BOOL rc = FALSE; - UINT32 flags; + UINT32 flags = 0; rdpSettings* settings = freerdp_settings_new(0); if (!settings) goto fail; @@ -442,10 +442,10 @@ static BOOL check_key_helpers(size_t key, const char* stype) int test_rounds = 100; BOOL res = FALSE; rdpSettings* settings = NULL; - SSIZE_T rc; - SSIZE_T tkey; - SSIZE_T type; - size_t x; + SSIZE_T rc = 0; + SSIZE_T tkey = 0; + SSIZE_T type = 0; + size_t x = 0; const size_t clear_keys[] = { FreeRDP_RdpServerCertificate, FreeRDP_RdpServerRsaKey, FreeRDP_RedirectionPassword, @@ -529,8 +529,8 @@ static BOOL check_key_helpers(size_t key, const char* stype) do { UINT16 intEntryType = 0; - BOOL expect; - BOOL have; + BOOL expect = 0; + BOOL have = 0; char value[8192] = { 0 }; union { @@ -720,7 +720,7 @@ fail: static BOOL check_device_type(void) { - size_t x; + size_t x = 0; struct test_entry { int expect; @@ -780,7 +780,7 @@ static BOOL check_device_type(void) static BOOL check_offsets(rdpSettings* settings, size_t id, size_t min, size_t max, BOOL checkPtr) { - size_t x; + size_t x = 0; BOOL rc = TRUE; WINPR_ASSERT(settings); @@ -800,13 +800,13 @@ static BOOL check_offsets(rdpSettings* settings, size_t id, size_t min, size_t m static BOOL test_write_offsets(rdpSettings* settings, size_t id, size_t elementSize, size_t min, size_t max) { - size_t x; + size_t x = 0; WINPR_ASSERT(settings); for (x = min; x < max; x++) { - const void* ptr; + const void* ptr = NULL; char buffer[8192] = { 0 }; winpr_RAND(buffer, sizeof(buffer)); @@ -832,7 +832,7 @@ static BOOL test_pointer_array(void) size_t size; size_t elementSize; }; - size_t x; + size_t x = 0; const struct pointer_test_case tests[] = { { FALSE, FALSE, FreeRDP_DeviceArray, FreeRDP_DeviceArraySize, 32, sizeof(RDPDR_DEVICE*) }, { FALSE, FALSE, FreeRDP_StaticChannelArray, FreeRDP_StaticChannelArraySize, 32, @@ -937,7 +937,7 @@ fail: int TestSettings(int argc, char* argv[]) { int rc = -1; - size_t x; + size_t x = 0; rdpSettings* settings = NULL; rdpSettings* cloned = NULL; rdpSettings* cloned2 = NULL; @@ -1121,7 +1121,7 @@ int TestSettings(int argc, char* argv[]) { const size_t key = string_list_indices[x]; const char val[] = "test-string"; - const char* res; + const char* res = NULL; const char* name = freerdp_settings_get_name_for_key(key); const char* oval = freerdp_settings_get_string(settings, key); const char* cval = freerdp_settings_get_string(cloned, key); diff --git a/libfreerdp/core/test/TestStreamDump.c b/libfreerdp/core/test/TestStreamDump.c index 613b8d462..912cc335f 100644 --- a/libfreerdp/core/test/TestStreamDump.c +++ b/libfreerdp/core/test/TestStreamDump.c @@ -16,7 +16,7 @@ static BOOL test_entry_read_write(void) wStream* sw = NULL; wStream* sr = NULL; size_t offset = 0; - size_t x; + size_t x = 0; UINT64 ts = 0; UINT32 flags = 0; BYTE tmp[16] = { 0 }; diff --git a/libfreerdp/core/test/TestVersion.c b/libfreerdp/core/test/TestVersion.c index 2a4bc5432..5910c4845 100644 --- a/libfreerdp/core/test/TestVersion.c +++ b/libfreerdp/core/test/TestVersion.c @@ -3,9 +3,9 @@ int TestVersion(int argc, char* argv[]) { - const char* version; - const char* git; - const char* build; + const char* version = NULL; + const char* git = NULL; + const char* build = NULL; int major = 0; int minor = 0; int revision = 0; diff --git a/libfreerdp/core/tpdu.c b/libfreerdp/core/tpdu.c index 347d3c4c7..9718cb11f 100644 --- a/libfreerdp/core/tpdu.c +++ b/libfreerdp/core/tpdu.c @@ -145,7 +145,7 @@ BOOL tpdu_write_header(wStream* s, UINT16 length, BYTE code) BOOL tpdu_read_connection_request(wStream* s, BYTE* li, UINT16 tpktlength) { - BYTE code; + BYTE code = 0; if (!tpdu_read_header(s, &code, li, tpktlength)) return FALSE; @@ -178,8 +178,8 @@ BOOL tpdu_write_connection_request(wStream* s, UINT16 length) BOOL tpdu_read_connection_confirm(wStream* s, BYTE* li, UINT16 tpktlength) { - BYTE code; - size_t position; + BYTE code = 0; + size_t position = 0; size_t bytes_read = 0; /* save the position to determine the number of bytes read */ diff --git a/libfreerdp/core/tpkt.c b/libfreerdp/core/tpkt.c index 6e137a65c..2e84c661b 100644 --- a/libfreerdp/core/tpkt.c +++ b/libfreerdp/core/tpkt.c @@ -69,7 +69,7 @@ int tpkt_verify_header(wStream* s) { - BYTE version; + BYTE version = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return -1; @@ -93,7 +93,7 @@ int tpkt_verify_header(wStream* s) BOOL tpkt_read_header(wStream* s, UINT16* length) { - BYTE version; + BYTE version = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -102,7 +102,7 @@ BOOL tpkt_read_header(wStream* s, UINT16* length) if (version == 3) { - UINT16 len; + UINT16 len = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) return FALSE; diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c index 96ff0b8f1..120253252 100644 --- a/libfreerdp/core/transport.c +++ b/libfreerdp/core/transport.c @@ -150,7 +150,7 @@ static void transport_ssl_cb(SSL* ssl, int where, int ret) wStream* transport_send_stream_init(rdpTransport* transport, size_t size) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(transport); if (!(s = StreamPool_Take(transport->ReceivePool, size))) @@ -176,8 +176,8 @@ BOOL transport_attach(rdpTransport* transport, int sockfd) static BOOL transport_default_attach(rdpTransport* transport, int sockfd) { BIO* socketBio = NULL; - BIO* bufferedBio; - const rdpSettings* settings; + BIO* bufferedBio = NULL; + const rdpSettings* settings = NULL; rdpContext* context = transport_get_context(transport); if (sockfd < 0) @@ -243,7 +243,7 @@ BOOL transport_connect_rdp(rdpTransport* transport) BOOL transport_connect_tls(rdpTransport* transport) { - const rdpSettings* settings; + const rdpSettings* settings = NULL; rdpContext* context = transport_get_context(transport); settings = context->settings; @@ -271,10 +271,10 @@ BOOL transport_connect_tls(rdpTransport* transport) static BOOL transport_default_connect_tls(rdpTransport* transport) { - int tlsStatus; + int tlsStatus = 0; rdpTls* tls = NULL; - rdpContext* context; - rdpSettings* settings; + rdpContext* context = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(transport); @@ -461,11 +461,11 @@ BOOL transport_connect_aad(rdpTransport* transport) BOOL transport_connect(rdpTransport* transport, const char* hostname, UINT16 port, DWORD timeout) { - int sockfd; + int sockfd = 0; BOOL status = FALSE; - rdpSettings* settings; + rdpSettings* settings = NULL; rdpContext* context = transport_get_context(transport); - BOOL rpcFallback; + BOOL rpcFallback = 0; WINPR_ASSERT(context); WINPR_ASSERT(hostname); @@ -553,10 +553,10 @@ BOOL transport_connect(rdpTransport* transport, const char* hostname, UINT16 por } else { - UINT16 peerPort; - const char* proxyHostname; - const char* proxyUsername; - const char* proxyPassword; + UINT16 peerPort = 0; + const char* proxyHostname = NULL; + const char* proxyUsername = NULL; + const char* proxyPassword = NULL; BOOL isProxyConnection = proxy_prepare(settings, &proxyHostname, &peerPort, &proxyUsername, &proxyPassword); @@ -614,7 +614,7 @@ BOOL transport_accept_tls(rdpTransport* transport) static BOOL transport_default_accept_tls(rdpTransport* transport) { rdpContext* context = transport_get_context(transport); - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(context); @@ -636,7 +636,7 @@ static BOOL transport_default_accept_tls(rdpTransport* transport) BOOL transport_accept_nla(rdpTransport* transport) { rdpContext* context = transport_get_context(transport); - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(context); @@ -716,9 +716,9 @@ fail: static void transport_bio_error_log(rdpTransport* transport, LPCSTR biofunc, BIO* bio, LPCSTR file, LPCSTR func, DWORD line) { - unsigned long sslerr; - int saveerrno; - DWORD level; + unsigned long sslerr = 0; + int saveerrno = 0; + DWORD level = 0; WINPR_ASSERT(transport); @@ -753,8 +753,8 @@ static void transport_bio_error_log(rdpTransport* transport, LPCSTR biofunc, BIO static SSIZE_T transport_read_layer(rdpTransport* transport, BYTE* data, size_t bytes) { SSIZE_T read = 0; - rdpRdp* rdp; - rdpContext* context; + rdpRdp* rdp = NULL; + rdpContext* context = NULL; WINPR_ASSERT(transport); @@ -839,7 +839,7 @@ static SSIZE_T transport_read_layer(rdpTransport* transport, BYTE* data, size_t */ static SSIZE_T transport_read_layer_bytes(rdpTransport* transport, wStream* s, size_t toRead) { - SSIZE_T status; + SSIZE_T status = 0; if (!transport) return -1; @@ -885,14 +885,14 @@ static SSIZE_T parse_nla_mode_pdu(rdpTransport* transport, wStream* stream) * bit 6 P/C constructed * bit 5 tag number - sequence */ - UINT8 typeEncoding; + UINT8 typeEncoding = 0; if (Stream_GetRemainingLength(s) < 1) return 0; Stream_Read_UINT8(s, typeEncoding); if (typeEncoding == 0x30) { /* TSRequest (NLA) */ - UINT8 lengthEncoding; + UINT8 lengthEncoding = 0; if (Stream_GetRemainingLength(s) < 1) return 0; Stream_Read_UINT8(s, lengthEncoding); @@ -900,7 +900,7 @@ static SSIZE_T parse_nla_mode_pdu(rdpTransport* transport, wStream* stream) { if ((lengthEncoding & ~(0x80)) == 1) { - UINT8 length; + UINT8 length = 0; if (Stream_GetRemainingLength(s) < 1) return 0; Stream_Read_UINT8(s, length); @@ -910,7 +910,7 @@ static SSIZE_T parse_nla_mode_pdu(rdpTransport* transport, wStream* stream) else if ((lengthEncoding & ~(0x80)) == 2) { /* check for header bytes already was readed in previous calls */ - UINT16 length; + UINT16 length = 0; if (Stream_GetRemainingLength(s) < 2) return 0; Stream_Read_UINT16_BE(s, length); @@ -939,14 +939,14 @@ static SSIZE_T parse_default_mode_pdu(rdpTransport* transport, wStream* stream) wStream sbuffer = { 0 }; wStream* s = Stream_StaticConstInit(&sbuffer, Stream_Buffer(stream), Stream_Length(stream)); - UINT8 version; + UINT8 version = 0; if (Stream_GetRemainingLength(s) < 1) return 0; Stream_Read_UINT8(s, version); if (version == 0x03) { /* TPKT header */ - UINT16 length; + UINT16 length = 0; if (Stream_GetRemainingLength(s) < 3) return 0; Stream_Seek(s, 1); @@ -963,13 +963,13 @@ static SSIZE_T parse_default_mode_pdu(rdpTransport* transport, wStream* stream) else { /* Fast-Path Header */ - UINT8 length1; + UINT8 length1 = 0; if (Stream_GetRemainingLength(s) < 1) return 0; Stream_Read_UINT8(s, length1); if (length1 & 0x80) { - UINT8 length2; + UINT8 length2 = 0; if (Stream_GetRemainingLength(s) < 1) return 0; Stream_Read_UINT8(s, length2); @@ -1030,10 +1030,10 @@ SSIZE_T transport_parse_pdu(rdpTransport* transport, wStream* s, BOOL* incomplet static int transport_default_read_pdu(rdpTransport* transport, wStream* s) { - BOOL incomplete; - SSIZE_T status; - size_t pduLength; - size_t position; + BOOL incomplete = 0; + SSIZE_T status = 0; + size_t pduLength = 0; + size_t position = 0; WINPR_ASSERT(transport); WINPR_ASSERT(s); @@ -1067,7 +1067,7 @@ static int transport_default_read_pdu(rdpTransport* transport, wStream* s) status = transport_parse_pdu(transport, s, &incomplete); while ((status == 0) && incomplete) { - int rc; + int rc = 0; if (!Stream_EnsureRemainingCapacity(s, 1)) return -1; rc = transport_read_layer_bytes(transport, s, 1); @@ -1114,10 +1114,10 @@ int transport_write(rdpTransport* transport, wStream* s) static int transport_default_write(rdpTransport* transport, wStream* s) { - size_t length; + size_t length = 0; int status = -1; int writtenlength = 0; - rdpRdp* rdp; + rdpRdp* rdp = NULL; rdpContext* context = transport_get_context(transport); WINPR_ASSERT(transport); @@ -1329,8 +1329,8 @@ DWORD transport_get_event_handles(rdpTransport* transport, HANDLE* events, DWORD #if defined(WITH_FREERDP_DEPRECATED) void transport_get_fds(rdpTransport* transport, void** rfds, int* rcount) { - DWORD index; - DWORD nCount; + DWORD index = 0; + DWORD nCount = 0; HANDLE events[MAXIMUM_WAIT_OBJECTS] = { 0 }; WINPR_ASSERT(transport); @@ -1375,9 +1375,9 @@ int transport_drain_output_buffer(rdpTransport* transport) int transport_check_fds(rdpTransport* transport) { - int status; - state_run_t recv_status; - wStream* received; + int status = 0; + state_run_t recv_status = STATE_RUN_FAILED; + wStream* received = NULL; rdpContext* context = transport_get_context(transport); WINPR_ASSERT(context); @@ -1712,7 +1712,7 @@ wStream* transport_take_from_pool(rdpTransport* transport, size_t size) ULONG transport_get_bytes_sent(rdpTransport* transport, BOOL resetCount) { - ULONG rc; + ULONG rc = 0; WINPR_ASSERT(transport); rc = transport->written; if (resetCount) diff --git a/libfreerdp/core/update.c b/libfreerdp/core/update.c index dd7f54c49..d95132bb8 100644 --- a/libfreerdp/core/update.c +++ b/libfreerdp/core/update.c @@ -56,7 +56,7 @@ static const char* update_type_to_string(UINT16 updateType) static BOOL update_recv_orders(rdpUpdate* update, wStream* s) { - UINT16 numberOrders; + UINT16 numberOrders = 0; WINPR_ASSERT(update); @@ -204,7 +204,7 @@ static BOOL update_write_bitmap_data(rdpUpdate* update_pub, wStream* s, BITMAP_D BITMAP_UPDATE* update_read_bitmap_update(rdpUpdate* update, wStream* s) { - UINT32 i; + UINT32 i = 0; BITMAP_UPDATE* bitmapUpdate = calloc(1, sizeof(BITMAP_UPDATE)); rdp_update_internal* up = update_cast(update); @@ -262,8 +262,8 @@ static BOOL update_write_bitmap_update(rdpUpdate* update, wStream* s, PALETTE_UPDATE* update_read_palette(rdpUpdate* update, wStream* s) { - int i; - PALETTE_ENTRY* entry; + int i = 0; + PALETTE_ENTRY* entry = NULL; PALETTE_UPDATE* palette_update = calloc(1, sizeof(PALETTE_UPDATE)); if (!palette_update) @@ -381,8 +381,8 @@ fail: static BOOL _update_read_pointer_color(wStream* s, POINTER_COLOR_UPDATE* pointer_color, BYTE xorBpp, UINT32 flags) { - BYTE* newMask; - UINT32 scanlineSize; + BYTE* newMask = NULL; + UINT32 scanlineSize = 0; UINT32 max = 32; WINPR_ASSERT(pointer_color); @@ -530,8 +530,8 @@ fail: static BOOL _update_read_pointer_large(wStream* s, POINTER_LARGE_UPDATE* pointer) { - BYTE* newMask; - UINT32 scanlineSize; + BYTE* newMask = NULL; + UINT32 scanlineSize = 0; if (!pointer) goto fail; @@ -715,7 +715,7 @@ fail: BOOL update_recv_pointer(rdpUpdate* update, wStream* s) { BOOL rc = FALSE; - UINT16 messageType; + UINT16 messageType = 0; WINPR_ASSERT(update); @@ -812,7 +812,7 @@ BOOL update_recv_pointer(rdpUpdate* update, wStream* s) BOOL update_recv(rdpUpdate* update, wStream* s) { BOOL rc = FALSE; - UINT16 updateType; + UINT16 updateType = 0; rdp_update_internal* up = update_cast(update); rdpContext* context = update->context; @@ -976,7 +976,7 @@ void update_post_disconnect(rdpUpdate* update) static BOOL _update_begin_paint(rdpContext* context) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdp_update_internal* update = update_cast(context->update); @@ -1003,7 +1003,7 @@ static BOOL _update_begin_paint(rdpContext* context) static BOOL _update_end_paint(rdpContext* context) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdp_update_internal* update = update_cast(context->update); @@ -1032,7 +1032,7 @@ static BOOL _update_end_paint(rdpContext* context) static void update_flush(rdpContext* context) { - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); update = update_cast(context->update); @@ -1051,8 +1051,8 @@ static void update_force_flush(rdpContext* context) static BOOL update_check_flush(rdpContext* context, size_t size) { - wStream* s; - rdp_update_internal* update; + wStream* s = NULL; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); update = update_cast(context->update); @@ -1076,7 +1076,7 @@ static BOOL update_check_flush(rdpContext* context, size_t size) static BOOL update_set_bounds(rdpContext* context, const rdpBounds* bounds) { - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); @@ -1116,7 +1116,7 @@ static BOOL update_bounds_equals(rdpBounds* bounds1, rdpBounds* bounds2) static int update_prepare_bounds(rdpContext* context, ORDER_INFO* orderInfo) { int length = 0; - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(orderInfo); @@ -1191,7 +1191,7 @@ static int update_prepare_order_info(rdpContext* context, ORDER_INFO* orderInfo, static int update_write_order_info(rdpContext* context, wStream* s, ORDER_INFO* orderInfo, size_t offset) { - size_t position; + size_t position = 0; WINPR_UNUSED(context); WINPR_ASSERT(orderInfo); @@ -1292,10 +1292,10 @@ static BOOL update_send_suppress_output(rdpContext* context, BYTE allow, const R static BOOL update_send_surface_command(rdpContext* context, wStream* s) { - wStream* update; + wStream* update = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; - BOOL ret; + BOOL ret = 0; WINPR_ASSERT(rdp); update = fastpath_update_pdu_init(rdp->fastpath); @@ -1319,7 +1319,7 @@ out: static BOOL update_send_surface_bits(rdpContext* context, const SURFACE_BITS_COMMAND* surfaceBitsCommand) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; BOOL ret = FALSE; @@ -1350,7 +1350,7 @@ out_fail: static BOOL update_send_surface_frame_marker(rdpContext* context, const SURFACE_FRAME_MARKER* surfaceFrameMarker) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; BOOL ret = FALSE; @@ -1377,7 +1377,7 @@ out_fail: static BOOL update_send_surface_frame_bits(rdpContext* context, const SURFACE_BITS_COMMAND* cmd, BOOL first, BOOL last, UINT32 frameId) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; @@ -1437,10 +1437,10 @@ static BOOL update_send_frame_acknowledge(rdpContext* context, UINT32 frameId) static BOOL update_send_synchronize(rdpContext* context) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; - BOOL ret; + BOOL ret = 0; WINPR_ASSERT(rdp); s = fastpath_update_pdu_init(rdp->fastpath); @@ -1462,7 +1462,7 @@ static BOOL update_send_desktop_resize(rdpContext* context) static BOOL update_send_bitmap_update(rdpContext* context, const BITMAP_UPDATE* bitmapUpdate) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; rdpUpdate* update = context->update; @@ -1492,7 +1492,7 @@ out_fail: static BOOL update_send_play_sound(rdpContext* context, const PLAY_SOUND_UPDATE* play_sound) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; @@ -1520,12 +1520,12 @@ static BOOL update_send_play_sound(rdpContext* context, const PLAY_SOUND_UPDATE* static BOOL update_send_dstblt(rdpContext* context, const DSTBLT_ORDER* dstblt) { - wStream* s; - size_t offset; - UINT32 headerLength; + wStream* s = NULL; + size_t offset = 0; + UINT32 headerLength = 0; ORDER_INFO orderInfo; - int inf; - rdp_update_internal* update; + int inf = 0; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(dstblt); @@ -1557,11 +1557,11 @@ static BOOL update_send_dstblt(rdpContext* context, const DSTBLT_ORDER* dstblt) static BOOL update_send_patblt(rdpContext* context, PATBLT_ORDER* patblt) { - wStream* s; - size_t offset; - int headerLength; + wStream* s = NULL; + size_t offset = 0; + int headerLength = 0; ORDER_INFO orderInfo; - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(patblt); @@ -1588,12 +1588,12 @@ static BOOL update_send_patblt(rdpContext* context, PATBLT_ORDER* patblt) static BOOL update_send_scrblt(rdpContext* context, const SCRBLT_ORDER* scrblt) { - wStream* s; - UINT32 offset; - UINT32 headerLength; + wStream* s = NULL; + UINT32 offset = 0; + UINT32 headerLength = 0; ORDER_INFO orderInfo; - int inf; - rdp_update_internal* update; + int inf = 0; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(scrblt); @@ -1621,11 +1621,11 @@ static BOOL update_send_scrblt(rdpContext* context, const SCRBLT_ORDER* scrblt) static BOOL update_send_opaque_rect(rdpContext* context, const OPAQUE_RECT_ORDER* opaque_rect) { - wStream* s; - size_t offset; - int headerLength; + wStream* s = NULL; + size_t offset = 0; + int headerLength = 0; ORDER_INFO orderInfo; - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(opaque_rect); @@ -1653,12 +1653,12 @@ static BOOL update_send_opaque_rect(rdpContext* context, const OPAQUE_RECT_ORDER static BOOL update_send_line_to(rdpContext* context, const LINE_TO_ORDER* line_to) { - wStream* s; - int offset; - int headerLength; + wStream* s = NULL; + int offset = 0; + int headerLength = 0; ORDER_INFO orderInfo; - int inf; - rdp_update_internal* update; + int inf = 0; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(line_to); @@ -1685,11 +1685,11 @@ static BOOL update_send_line_to(rdpContext* context, const LINE_TO_ORDER* line_t static BOOL update_send_memblt(rdpContext* context, MEMBLT_ORDER* memblt) { - wStream* s; - size_t offset; - int headerLength; + wStream* s = NULL; + size_t offset = 0; + int headerLength = 0; ORDER_INFO orderInfo; - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(memblt); @@ -1715,12 +1715,12 @@ static BOOL update_send_memblt(rdpContext* context, MEMBLT_ORDER* memblt) static BOOL update_send_glyph_index(rdpContext* context, GLYPH_INDEX_ORDER* glyph_index) { - wStream* s; - size_t offset; - int headerLength; - int inf; + wStream* s = NULL; + size_t offset = 0; + int headerLength = 0; + int inf = 0; ORDER_INFO orderInfo; - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(glyph_index); @@ -2054,14 +2054,14 @@ static BOOL update_send_cache_brush(rdpContext* context, const CACHE_BRUSH_ORDER static BOOL update_send_create_offscreen_bitmap_order( rdpContext* context, const CREATE_OFFSCREEN_BITMAP_ORDER* create_offscreen_bitmap) { - wStream* s; - size_t bm; - size_t em; - size_t inf; - BYTE orderType; - BYTE controlFlags; - size_t headerLength; - rdp_update_internal* update; + wStream* s = NULL; + size_t bm = 0; + size_t em = 0; + size_t inf = 0; + BYTE orderType = 0; + BYTE controlFlags = 0; + size_t headerLength = 0; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(create_offscreen_bitmap); @@ -2099,14 +2099,14 @@ static BOOL update_send_create_offscreen_bitmap_order( static BOOL update_send_switch_surface_order(rdpContext* context, const SWITCH_SURFACE_ORDER* switch_surface) { - wStream* s; - size_t bm; - size_t em; - size_t inf; - BYTE orderType; - BYTE controlFlags; - size_t headerLength; - rdp_update_internal* update; + wStream* s = NULL; + size_t bm = 0; + size_t em = 0; + size_t inf = 0; + BYTE orderType = 0; + BYTE controlFlags = 0; + size_t headerLength = 0; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(switch_surface); @@ -2143,12 +2143,12 @@ static BOOL update_send_switch_surface_order(rdpContext* context, static BOOL update_send_pointer_system(rdpContext* context, const POINTER_SYSTEM_UPDATE* pointer_system) { - wStream* s; - BYTE updateCode; + wStream* s = NULL; + BYTE updateCode = 0; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; - BOOL ret; + BOOL ret = 0; WINPR_ASSERT(rdp); s = fastpath_update_pdu_init(rdp->fastpath); @@ -2169,7 +2169,7 @@ static BOOL update_send_pointer_system(rdpContext* context, static BOOL update_send_pointer_position(rdpContext* context, const POINTER_POSITION_UPDATE* pointerPosition) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; BOOL ret = FALSE; @@ -2219,7 +2219,7 @@ static BOOL update_write_pointer_color(wStream* s, const POINTER_COLOR_UPDATE* p static BOOL update_send_pointer_color(rdpContext* context, const POINTER_COLOR_UPDATE* pointer_color) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; @@ -2264,7 +2264,7 @@ static BOOL update_write_pointer_large(wStream* s, const POINTER_LARGE_UPDATE* p static BOOL update_send_pointer_large(rdpContext* context, const POINTER_LARGE_UPDATE* pointer) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; BOOL ret = FALSE; @@ -2287,7 +2287,7 @@ out_fail: static BOOL update_send_pointer_new(rdpContext* context, const POINTER_NEW_UPDATE* pointer_new) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; @@ -2314,11 +2314,11 @@ out_fail: static BOOL update_send_pointer_cached(rdpContext* context, const POINTER_CACHED_UPDATE* pointer_cached) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; - BOOL ret; + BOOL ret = 0; WINPR_ASSERT(rdp); WINPR_ASSERT(pointer_cached); @@ -2335,7 +2335,7 @@ static BOOL update_send_pointer_cached(rdpContext* context, BOOL update_read_refresh_rect(rdpUpdate* update, wStream* s) { - BYTE numberOfAreas; + BYTE numberOfAreas = 0; RECTANGLE_16 areas[256] = { 0 }; rdp_update_internal* up = update_cast(update); @@ -2373,7 +2373,7 @@ BOOL update_read_suppress_output(rdpUpdate* update, wStream* s) rdp_update_internal* up = update_cast(update); RECTANGLE_16* prect = NULL; RECTANGLE_16 rect = { 0 }; - BYTE allowDisplayUpdates; + BYTE allowDisplayUpdates = 0; WINPR_ASSERT(up); WINPR_ASSERT(s); @@ -2409,7 +2409,7 @@ BOOL update_read_suppress_output(rdpUpdate* update, wStream* s) static BOOL update_send_set_keyboard_indicators(rdpContext* context, UINT16 led_flags) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; @@ -2428,7 +2428,7 @@ static BOOL update_send_set_keyboard_indicators(rdpContext* context, UINT16 led_ static BOOL update_send_set_keyboard_ime_status(rdpContext* context, UINT16 imeId, UINT32 imeState, UINT32 imeConvMode) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; @@ -2524,10 +2524,10 @@ static BOOL update_send_new_or_existing_window(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_STATE_ORDER* stateOrder) { - wStream* s; + wStream* s = NULL; BYTE controlFlags = ORDER_SECONDARY | (ORDER_TYPE_WINDOW << 2); UINT16 orderSize = update_calculate_new_or_existing_window(orderInfo, stateOrder); - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(orderInfo); @@ -2704,13 +2704,13 @@ static UINT16 update_calculate_window_icon_order(const WINDOW_ORDER_INFO* orderI static BOOL update_send_window_icon(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_ICON_ORDER* iconOrder) { - wStream* s; + wStream* s = NULL; BYTE controlFlags = ORDER_SECONDARY | (ORDER_TYPE_WINDOW << 2); WINPR_ASSERT(iconOrder); ICON_INFO* iconInfo = iconOrder->iconInfo; UINT16 orderSize = update_calculate_window_icon_order(orderInfo, iconOrder); - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(orderInfo); @@ -2763,13 +2763,13 @@ static BOOL update_send_window_icon(rdpContext* context, const WINDOW_ORDER_INFO static BOOL update_send_window_cached_icon(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_CACHED_ICON_ORDER* cachedIconOrder) { - wStream* s; + wStream* s = NULL; BYTE controlFlags = ORDER_SECONDARY | (ORDER_TYPE_WINDOW << 2); UINT16 orderSize = 14; WINPR_ASSERT(cachedIconOrder); const CACHED_ICON_INFO* cachedIcon = &cachedIconOrder->cachedIcon; - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(orderInfo); @@ -2800,10 +2800,10 @@ static BOOL update_send_window_cached_icon(rdpContext* context, const WINDOW_ORD static BOOL update_send_window_delete(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo) { - wStream* s; + wStream* s = NULL; BYTE controlFlags = ORDER_SECONDARY | (ORDER_TYPE_WINDOW << 2); UINT16 orderSize = 11; - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(orderInfo); @@ -2878,12 +2878,12 @@ update_send_new_or_existing_notification_icons(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const NOTIFY_ICON_STATE_ORDER* iconStateOrder) { - wStream* s; + wStream* s = NULL; BYTE controlFlags = ORDER_SECONDARY | (ORDER_TYPE_WINDOW << 2); BOOL versionFieldPresent = FALSE; const UINT16 orderSize = update_calculate_new_or_existing_notification_icons_order(orderInfo, iconStateOrder); - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(orderInfo); @@ -2994,10 +2994,10 @@ static BOOL update_send_notify_icon_update(rdpContext* context, const WINDOW_ORD static BOOL update_send_notify_icon_delete(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo) { - wStream* s; + wStream* s = NULL; BYTE controlFlags = ORDER_SECONDARY | (ORDER_TYPE_WINDOW << 2); UINT16 orderSize = 15; - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(orderInfo); @@ -3044,11 +3044,11 @@ static UINT16 update_calculate_monitored_desktop(const WINDOW_ORDER_INFO* orderI static BOOL update_send_monitored_desktop(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const MONITORED_DESKTOP_ORDER* monitoredDesktop) { - UINT32 i; - wStream* s; + UINT32 i = 0; + wStream* s = NULL; BYTE controlFlags = ORDER_SECONDARY | (ORDER_TYPE_WINDOW << 2); UINT16 orderSize = update_calculate_monitored_desktop(orderInfo, monitoredDesktop); - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(orderInfo); @@ -3090,10 +3090,10 @@ static BOOL update_send_monitored_desktop(rdpContext* context, const WINDOW_ORDE static BOOL update_send_non_monitored_desktop(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo) { - wStream* s; + wStream* s = NULL; BYTE controlFlags = ORDER_SECONDARY | (ORDER_TYPE_WINDOW << 2); UINT16 orderSize = 7; - rdp_update_internal* update; + rdp_update_internal* update = NULL; WINPR_ASSERT(context); WINPR_ASSERT(orderInfo); diff --git a/libfreerdp/core/utils.c b/libfreerdp/core/utils.c index 4a71d83a9..1bcb09075 100644 --- a/libfreerdp/core/utils.c +++ b/libfreerdp/core/utils.c @@ -63,10 +63,10 @@ static BOOL utils_copy_smartcard_settings(const rdpSettings* settings, rdpSettin auth_status utils_authenticate_gateway(freerdp* instance, rdp_auth_reason reason) { - rdpSettings* settings; - rdpSettings* origSettings; + rdpSettings* settings = NULL; + rdpSettings* origSettings = NULL; BOOL prompt = FALSE; - BOOL proceed; + BOOL proceed = 0; WINPR_ASSERT(instance); WINPR_ASSERT(instance->context); @@ -133,10 +133,10 @@ auth_status utils_authenticate_gateway(freerdp* instance, rdp_auth_reason reason auth_status utils_authenticate(freerdp* instance, rdp_auth_reason reason, BOOL override) { - rdpSettings* settings; - rdpSettings* origSettings; + rdpSettings* settings = NULL; + rdpSettings* origSettings = NULL; BOOL prompt = !override; - BOOL proceed; + BOOL proceed = 0; WINPR_ASSERT(instance); WINPR_ASSERT(instance->context); @@ -283,7 +283,7 @@ HANDLE utils_get_abort_event(rdpRdp* rdp) BOOL utils_abort_event_is_set(rdpRdp* rdp) { - DWORD status; + DWORD status = 0; WINPR_ASSERT(rdp); status = WaitForSingleObject(rdp->abortEvent, 0); return status == WAIT_OBJECT_0; diff --git a/libfreerdp/core/window.c b/libfreerdp/core/window.c index 145568ab4..33900d20b 100644 --- a/libfreerdp/core/window.c +++ b/libfreerdp/core/window.c @@ -35,8 +35,8 @@ static void update_free_window_icon_info(ICON_INFO* iconInfo); BOOL rail_read_unicode_string(wStream* s, RAIL_UNICODE_STRING* unicode_string) { - UINT16 new_len; - BYTE* new_str; + UINT16 new_len = 0; + BYTE* new_str = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, s, 2)) return FALSE; @@ -164,7 +164,7 @@ static BOOL update_read_icon_info(wStream* s, ICON_INFO* iconInfo) /* colorTable */ if (iconInfo->cbColorTable > 0) { - BYTE* new_tab; + BYTE* new_tab = NULL; new_tab = (BYTE*)realloc(iconInfo->colorTable, iconInfo->cbColorTable); if (!new_tab) @@ -239,9 +239,9 @@ static BOOL update_read_notify_icon_infotip(wStream* s, NOTIFY_ICON_INFOTIP* not static BOOL update_read_window_state_order(wStream* s, WINDOW_ORDER_INFO* orderInfo, WINDOW_STATE_ORDER* windowState) { - UINT32 i; - size_t size; - RECTANGLE_16* newRect; + UINT32 i = 0; + size_t size = 0; + RECTANGLE_16* newRect = NULL; if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_OWNER) { @@ -509,7 +509,7 @@ static BOOL window_order_supported(const rdpSettings* settings, UINT32 fieldFlag { const UINT32 mask = (WINDOW_ORDER_FIELD_CLIENT_AREA_SIZE | WINDOW_ORDER_FIELD_RP_CONTENT | WINDOW_ORDER_FIELD_ROOT_PARENT); - BOOL dresult; + BOOL dresult = 0; if (!settings) return FALSE; @@ -579,7 +579,7 @@ static void dump_window_state_order(wLog* log, const char* msg, const WINDOW_ORD if (order->fieldFlags & WINDOW_ORDER_FIELD_SHOW) { - const char* showStr; + const char* showStr = NULL; switch (state->showState) { case 0: @@ -633,7 +633,7 @@ static void dump_window_state_order(wLog* log, const char* msg, const WINDOW_ORD if (order->fieldFlags & WINDOW_ORDER_FIELD_WND_RECTS) { - UINT32 i; + UINT32 i = 0; DUMP_APPEND(buffer, bufferSize, " windowRects=("); for (i = 0; i < state->numWindowRects; i++) { @@ -650,7 +650,7 @@ static void dump_window_state_order(wLog* log, const char* msg, const WINDOW_ORD if (order->fieldFlags & WINDOW_ORDER_FIELD_VISIBILITY) { - UINT32 i; + UINT32 i = 0; DUMP_APPEND(buffer, bufferSize, " visibilityRects=("); for (i = 0; i < state->numVisibilityRects; i++) { @@ -677,7 +677,7 @@ static void dump_window_state_order(wLog* log, const char* msg, const WINDOW_ORD DUMP_APPEND(buffer, bufferSize, " appBarState=0x%" PRIx8 "", state->AppBarState); if (order->fieldFlags & WINDOW_ORDER_FIELD_APPBAR_EDGE) { - const char* appBarEdgeStr; + const char* appBarEdgeStr = NULL; switch (state->AppBarEdge) { case 0: @@ -895,8 +895,8 @@ static BOOL update_recv_notification_icon_info_order(rdpUpdate* update, wStream* static BOOL update_read_desktop_actively_monitored_order(wStream* s, WINDOW_ORDER_INFO* orderInfo, MONITORED_DESKTOP_ORDER* monitored_desktop) { - int i; - int size; + int i = 0; + int size = 0; if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_DESKTOP_ACTIVE_WND) { @@ -908,7 +908,7 @@ static BOOL update_read_desktop_actively_monitored_order(wStream* s, WINDOW_ORDE if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_DESKTOP_ZORDER) { - UINT32* newid; + UINT32* newid = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -961,7 +961,7 @@ static void dump_monitored_desktop(wLog* log, const char* msg, const WINDOW_ORDE if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_DESKTOP_ZORDER) { - UINT32 i; + UINT32 i = 0; DUMP_APPEND(buffer, bufferSize, " windows=("); for (i = 0; i < monitored->numWindowIds; i++) @@ -1027,8 +1027,8 @@ void update_free_window_icon_info(ICON_INFO* iconInfo) BOOL update_recv_altsec_window_order(rdpUpdate* update, wStream* s) { BOOL rc = TRUE; - size_t remaining; - UINT16 orderSize; + size_t remaining = 0; + UINT16 orderSize = 0; WINDOW_ORDER_INFO orderInfo = { 0 }; rdp_update_internal* up = update_cast(update); diff --git a/libfreerdp/crypto/base64.c b/libfreerdp/crypto/base64.c index c9ec95f11..fce8ba34c 100644 --- a/libfreerdp/crypto/base64.c +++ b/libfreerdp/crypto/base64.c @@ -29,12 +29,12 @@ static const char base64url[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstu static char* base64_encode_ex(const char* alphabet, const BYTE* data, size_t length, BOOL pad, BOOL crLf, size_t lineSize) { - int c; - const BYTE* q; - char* p; - char* ret; + int c = 0; + const BYTE* q = NULL; + char* p = NULL; + char* ret = NULL; int i = 0; - int blocks; + int blocks = 0; size_t outLen = (length + 3) * 4 / 3; size_t extra = 0; if (crLf) @@ -137,11 +137,11 @@ static void* base64_decode(const char* alphabet, const char* s, size_t length, s BOOL pad) { int n[4]; - BYTE* q; - BYTE* data; - size_t nBlocks; - size_t i; - size_t outputLen; + BYTE* q = NULL; + BYTE* data = NULL; + size_t nBlocks = 0; + size_t i = 0; + size_t outputLen = 0; int remainder = length % 4; if ((pad && remainder > 0) || (remainder == 1)) diff --git a/libfreerdp/crypto/ber.c b/libfreerdp/crypto/ber.c index eb2bd654e..6a64e2af8 100644 --- a/libfreerdp/crypto/ber.c +++ b/libfreerdp/crypto/ber.c @@ -31,7 +31,7 @@ BOOL ber_read_length(wStream* s, size_t* length) { - BYTE byte; + BYTE byte = 0; WINPR_ASSERT(s); WINPR_ASSERT(length); @@ -121,7 +121,7 @@ size_t _ber_sizeof_length(size_t length) BOOL ber_read_universal_tag(wStream* s, BYTE tag, BOOL pc) { - BYTE byte; + BYTE byte = 0; const BYTE expect = (BER_CLASS_UNIV | BER_PC(pc) | (BER_TAG_MASK & tag)); WINPR_ASSERT(s); @@ -163,7 +163,7 @@ size_t ber_write_universal_tag(wStream* s, BYTE tag, BOOL pc) BOOL ber_read_application_tag(wStream* s, BYTE tag, size_t* length) { - BYTE byte; + BYTE byte = 0; WINPR_ASSERT(s); WINPR_ASSERT(length); @@ -243,7 +243,7 @@ void ber_write_application_tag(wStream* s, BYTE tag, size_t length) BOOL ber_read_contextual_tag(wStream* s, BYTE tag, size_t* length, BOOL pc) { const BYTE expect = ((BER_CLASS_CTXT | BER_PC(pc)) | (BER_TAG_MASK & tag)); - BYTE byte; + BYTE byte = 0; WINPR_ASSERT(s); WINPR_ASSERT(length); @@ -283,7 +283,7 @@ size_t ber_sizeof_contextual_tag(size_t length) BOOL ber_read_sequence_tag(wStream* s, size_t* length) { const BYTE expect = ((BER_CLASS_UNIV | BER_CONSTRUCT) | (BER_TAG_SEQUENCE_OF)); - BYTE byte; + BYTE byte = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -323,7 +323,7 @@ size_t ber_sizeof_sequence_tag(size_t length) BOOL ber_read_enumerated(wStream* s, BYTE* enumerated, BYTE count) { - size_t length; + size_t length = 0; WINPR_ASSERT(enumerated); @@ -391,8 +391,8 @@ size_t ber_write_octet_string(wStream* s, const BYTE* oct_str, size_t length) size_t ber_write_contextual_octet_string(wStream* s, BYTE tag, const BYTE* oct_str, size_t length) { size_t inner = ber_sizeof_octet_string(length); - size_t ret; - size_t r; + size_t ret = 0; + size_t r = 0; ret = ber_write_contextual_tag(s, tag, inner, TRUE); if (!ret) @@ -422,7 +422,7 @@ size_t ber_write_contextual_unicode_octet_string(wStream* s, BYTE tag, LPWSTR st WINPR_ASSERT(str); size_t len = _wcslen(str) * sizeof(WCHAR); size_t inner_len = ber_sizeof_octet_string(len); - size_t ret; + size_t ret = 0; ret = ber_write_contextual_tag(s, tag, inner_len, TRUE); return ret + ber_write_octet_string(s, (const BYTE*)str, len); @@ -430,7 +430,7 @@ size_t ber_write_contextual_unicode_octet_string(wStream* s, BYTE tag, LPWSTR st size_t ber_write_contextual_char_to_unicode_octet_string(wStream* s, BYTE tag, const char* str) { - size_t ret; + size_t ret = 0; size_t len = strlen(str); size_t inner_len = ber_sizeof_octet_string(len * 2); @@ -449,7 +449,7 @@ size_t ber_write_contextual_char_to_unicode_octet_string(wStream* s, BYTE tag, c BOOL ber_read_unicode_octet_string(wStream* s, LPWSTR* str) { LPWSTR ret = NULL; - size_t length; + size_t length = 0; if (!ber_read_octet_string_tag(s, &length)) return FALSE; @@ -470,8 +470,8 @@ BOOL ber_read_unicode_octet_string(wStream* s, LPWSTR* str) BOOL ber_read_char_from_unicode_octet_string(wStream* s, char** str) { - size_t length; - char* ptr; + size_t length = 0; + char* ptr = NULL; *str = NULL; if (!ber_read_octet_string_tag(s, &length)) @@ -491,7 +491,7 @@ BOOL ber_read_octet_string_tag(wStream* s, size_t* length) BOOL ber_read_octet_string(wStream* s, BYTE** content, size_t* length) { - BYTE* ret; + BYTE* ret = NULL; WINPR_ASSERT(s); WINPR_ASSERT(content); @@ -539,8 +539,8 @@ size_t ber_sizeof_contextual_octet_string(size_t length) BOOL ber_read_BOOL(wStream* s, BOOL* value) { - size_t length; - BYTE v; + size_t length = 0; + BYTE v = 0; WINPR_ASSERT(value); if (!ber_read_universal_tag(s, BER_TAG_BOOLEAN, FALSE) || !ber_read_length(s, &length)) @@ -575,7 +575,7 @@ void ber_write_BOOL(wStream* s, BOOL value) BOOL ber_read_integer(wStream* s, UINT32* value) { - size_t length; + size_t length = 0; WINPR_ASSERT(s); @@ -602,7 +602,7 @@ BOOL ber_read_integer(wStream* s, UINT32* value) } else if (length == 3) { - BYTE byte; + BYTE byte = 0; Stream_Read_UINT8(s, byte); Stream_Read_UINT16_BE(s, *value); *value += (byte << 16); diff --git a/libfreerdp/crypto/certificate.c b/libfreerdp/crypto/certificate.c index c7d367da6..5cabec712 100644 --- a/libfreerdp/crypto/certificate.c +++ b/libfreerdp/crypto/certificate.c @@ -1003,7 +1003,7 @@ BOOL freerdp_certificate_read_server_cert(rdpCertificate* certificate, const BYT size_t length) { BOOL ret = FALSE; - wStream* s; + wStream* s = NULL; wStream sbuffer; UINT32 dwVersion = 0; @@ -1337,7 +1337,7 @@ char* freerdp_certificate_get_fingerprint_by_hash_ex(const rdpCertificate* cert, size_t i = 0; for (i = 0; i < (fp_len - 1); i++) { - int rc; + int rc = 0; char* p = &fp_buffer[pos]; if (separator) rc = sprintf_s(p, size - pos, "%02" PRIx8 ":", fp[i]); @@ -1410,8 +1410,8 @@ char* freerdp_certificate_get_pem(const rdpCertificate* cert, size_t* pLength) if (!cert->x509) return NULL; - BIO* bio; - int status; + BIO* bio = NULL; + int status = 0; /** * Don't manage certificates internally, leave it up entirely to the external client @@ -1491,7 +1491,7 @@ BOOL freerdp_certificate_get_public_key(const rdpCertificate* cert, BYTE** Publi { BYTE* ptr = NULL; BYTE* optr = NULL; - int length; + int length = 0; BOOL status = FALSE; EVP_PKEY* pkey = NULL; diff --git a/libfreerdp/crypto/certificate_data.c b/libfreerdp/crypto/certificate_data.c index 12737f176..fb13a0711 100644 --- a/libfreerdp/crypto/certificate_data.c +++ b/libfreerdp/crypto/certificate_data.c @@ -93,7 +93,7 @@ fail: static rdpCertificateData* freerdp_certificate_data_new_nocopy(const char* hostname, UINT16 port, rdpCertificate* xcert) { - size_t i; + size_t i = 0; rdpCertificateData* certdata = NULL; if (!hostname || !xcert) diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c index 98631f006..98f85c004 100644 --- a/libfreerdp/crypto/crypto.c +++ b/libfreerdp/crypto/crypto.c @@ -175,8 +175,8 @@ SSIZE_T crypto_rsa_private_decrypt(const BYTE* input, size_t length, const rdpPr void crypto_reverse(BYTE* data, size_t length) { - size_t i; - size_t j; + size_t i = 0; + size_t j = 0; if (length < 1) return; diff --git a/libfreerdp/crypto/er.c b/libfreerdp/crypto/er.c index dfa9ffae3..8616e17b8 100644 --- a/libfreerdp/crypto/er.c +++ b/libfreerdp/crypto/er.c @@ -28,7 +28,7 @@ void er_read_length(wStream* s, int* length) { - BYTE byte; + BYTE byte = 0; Stream_Read_UINT8(s, byte); @@ -93,7 +93,7 @@ int er_get_content_length(int length) BOOL er_read_universal_tag(wStream* s, BYTE tag, BOOL pc) { - BYTE byte; + BYTE byte = 0; Stream_Read_UINT8(s, byte); @@ -124,7 +124,7 @@ void er_write_universal_tag(wStream* s, BYTE tag, BOOL pc) BOOL er_read_application_tag(wStream* s, BYTE tag, int* length) { - BYTE byte; + BYTE byte = 0; if (tag > 30) { @@ -177,7 +177,7 @@ void er_write_application_tag(wStream* s, BYTE tag, int length, BOOL flag) BOOL er_read_contextual_tag(wStream* s, BYTE tag, int* length, BOOL pc) { - BYTE byte; + BYTE byte = 0; Stream_Read_UINT8(s, byte); @@ -205,7 +205,7 @@ int er_skip_contextual_tag(int length) BOOL er_read_sequence_tag(wStream* s, int* length) { - BYTE byte; + BYTE byte = 0; Stream_Read_UINT8(s, byte); @@ -326,7 +326,7 @@ int er_skip_octet_string(int length) BOOL er_read_BOOL(wStream* s, BOOL* value) { int length = 0; - BYTE v; + BYTE v = 0; if (!er_read_universal_tag(s, ER_TAG_BOOLEAN, FALSE)) return FALSE; @@ -374,7 +374,7 @@ BOOL er_read_integer(wStream* s, UINT32* value) } else if (length == 3) { - BYTE byte; + BYTE byte = 0; Stream_Read_UINT8(s, byte); Stream_Read_UINT16_BE(s, *value); *value += (byte << 16); diff --git a/libfreerdp/crypto/per.c b/libfreerdp/crypto/per.c index 6c15a11cc..9e4ad8575 100644 --- a/libfreerdp/crypto/per.c +++ b/libfreerdp/crypto/per.c @@ -37,7 +37,7 @@ BOOL per_read_length(wStream* s, UINT16* length) { - BYTE byte; + BYTE byte = 0; WINPR_ASSERT(length); if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) @@ -234,7 +234,7 @@ BOOL per_write_padding(wStream* s, UINT16 length) BOOL per_read_integer(wStream* s, UINT32* integer) { - UINT16 length; + UINT16 length = 0; WINPR_ASSERT(integer); @@ -415,8 +415,8 @@ static BOOL per_check_oid_and_log_mismatch(const BYTE* got, const BYTE* expect, BOOL per_read_object_identifier(wStream* s, const BYTE oid[6]) { - BYTE t12; - UINT16 length; + BYTE t12 = 0; + UINT16 length = 0; BYTE a_oid[6] = { 0 }; if (!per_read_length(s, &length)) @@ -475,7 +475,7 @@ BOOL per_write_object_identifier(wStream* s, const BYTE oid[6]) static void per_write_string(wStream* s, BYTE* str, int length) { - int i; + int i = 0; for (i = 0; i < length; i++) Stream_Write_UINT8(s, str[i]); @@ -526,8 +526,8 @@ BOOL per_read_octet_string(wStream* s, const BYTE* oct_str, UINT16 length, UINT1 BOOL per_write_octet_string(wStream* s, const BYTE* oct_str, UINT16 length, UINT16 min) { - UINT16 i; - UINT16 mlength; + UINT16 i = 0; + UINT16 mlength = 0; mlength = (length >= min) ? length - min : min; @@ -551,8 +551,8 @@ BOOL per_write_octet_string(wStream* s, const BYTE* oct_str, UINT16 length, UINT BOOL per_read_numeric_string(wStream* s, UINT16 min) { - size_t length; - UINT16 mlength; + size_t length = 0; + UINT16 mlength = 0; if (!per_read_length(s, &mlength)) return FALSE; @@ -578,11 +578,11 @@ BOOL per_read_numeric_string(wStream* s, UINT16 min) BOOL per_write_numeric_string(wStream* s, const BYTE* num_str, UINT16 length, UINT16 min) { - UINT16 i; - UINT16 mlength; - BYTE num; - BYTE c1; - BYTE c2; + UINT16 i = 0; + UINT16 mlength = 0; + BYTE num = 0; + BYTE c1 = 0; + BYTE c2 = 0; mlength = (length >= min) ? length - min : min; diff --git a/libfreerdp/crypto/privatekey.c b/libfreerdp/crypto/privatekey.c index 97c1dd074..159157cf7 100644 --- a/libfreerdp/crypto/privatekey.c +++ b/libfreerdp/crypto/privatekey.c @@ -121,7 +121,7 @@ fail: static EVP_PKEY* evp_pkey_utils_from_pem(const char* data, size_t len, BOOL fromFile) { EVP_PKEY* evp = NULL; - BIO* bio; + BIO* bio = NULL; if (fromFile) bio = BIO_new_file(data, "rb"); else diff --git a/libfreerdp/crypto/test/TestBase64.c b/libfreerdp/crypto/test/TestBase64.c index 84b4d445b..4ea055957 100644 --- a/libfreerdp/crypto/test/TestBase64.c +++ b/libfreerdp/crypto/test/TestBase64.c @@ -52,10 +52,10 @@ static const struct Encode64test encodeTests_base64url[] = { int TestBase64(int argc, char* argv[]) { - int i; + int i = 0; int testNb = 0; - size_t outLen; - BYTE* decoded; + size_t outLen = 0; + BYTE* decoded = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); testNb++; diff --git a/libfreerdp/crypto/test/TestKnownHosts.c b/libfreerdp/crypto/test/TestKnownHosts.c index c93970284..c1b700638 100644 --- a/libfreerdp/crypto/test/TestKnownHosts.c +++ b/libfreerdp/crypto/test/TestKnownHosts.c @@ -124,7 +124,7 @@ static int prepare(const char* currentFileV2) " \t#anothercomment\r\n" "otherurl\t3389\taa:bb:cc:dd\tsubject2\tissuer2\r" }; FILE* fc = NULL; - size_t i; + size_t i = 0; fc = winpr_fopen(currentFileV2, "w+"); if (!fc) @@ -226,7 +226,7 @@ static BOOL compare_ex(const rdpCertificateData* data, const rdpCertificateData* static BOOL test_get_data(rdpCertificateStore* store, const rdpCertificateData* data) { - BOOL res; + BOOL res = 0; rdpCertificateData* stored = freerdp_certificate_store_load_data( store, freerdp_certificate_data_get_host(data), freerdp_certificate_data_get_port(data)); if (!stored) @@ -239,7 +239,7 @@ static BOOL test_get_data(rdpCertificateStore* store, const rdpCertificateData* static BOOL test_get_data_ex(rdpCertificateStore* store, const rdpCertificateData* data) { - BOOL res; + BOOL res = 0; rdpCertificateData* stored = freerdp_certificate_store_load_data( store, freerdp_certificate_data_get_host(data), freerdp_certificate_data_get_port(data)); if (!stored) diff --git a/libfreerdp/crypto/test/Test_x509_utils.c b/libfreerdp/crypto/test/Test_x509_utils.c index 5849bd83a..7d90e3816 100644 --- a/libfreerdp/crypto/test/Test_x509_utils.c +++ b/libfreerdp/crypto/test/Test_x509_utils.c @@ -101,7 +101,7 @@ static int TestCertificateFile(const char* certificate_path, for (size_t i = 0; i < count; i++) { const certificate_test_t* test = &ccertificate_tests[i]; - char* result; + char* result = NULL; if (test->status == DISABLED) { @@ -188,7 +188,7 @@ static const signature_alg_test_t signature_alg_tests[] = { static int TestSignatureAlgorithm(const signature_alg_test_t* test) { int success = 0; - WINPR_MD_TYPE signature_alg; + WINPR_MD_TYPE signature_alg = WINPR_MD_NONE; char* path = certificate_path(test->filename); X509* certificate = x509_utils_from_pem(path, strlen(path), TRUE); @@ -221,7 +221,7 @@ fail: int Test_x509_utils(int argc, char* argv[]) { char* cert_path = certificate_path("Test_x509_cert_info.pem"); - int ret; + int ret = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c index 9a38493c4..371b81b8d 100644 --- a/libfreerdp/crypto/tls.c +++ b/libfreerdp/crypto/tls.c @@ -115,8 +115,8 @@ static void free_tls_bindings(rdpTls* tls) static int bio_rdp_tls_write(BIO* bio, const char* buf, int size) { - int error; - int status; + int error = 0; + int status = 0; BIO_RDP_TLS* tls = (BIO_RDP_TLS*)BIO_get_data(bio); if (!buf || !tls) @@ -169,8 +169,8 @@ static int bio_rdp_tls_write(BIO* bio, const char* buf, int size) static int bio_rdp_tls_read(BIO* bio, char* buf, int size) { - int error; - int status; + int error = 0; + int status = 0; BIO_RDP_TLS* tls = (BIO_RDP_TLS*)BIO_get_data(bio); if (!buf || !tls) @@ -240,8 +240,8 @@ static int bio_rdp_tls_read(BIO* bio, char* buf, int size) static int bio_rdp_tls_puts(BIO* bio, const char* str) { - size_t size; - int status; + size_t size = 0; + int status = 0; if (!str) return 0; @@ -259,9 +259,9 @@ static int bio_rdp_tls_gets(BIO* bio, char* str, int size) static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr) { - BIO* ssl_rbio; - BIO* ssl_wbio; - BIO* next_bio; + BIO* ssl_rbio = NULL; + BIO* ssl_wbio = NULL; + BIO* next_bio = NULL; int status = -1; BIO_RDP_TLS* tls = (BIO_RDP_TLS*)BIO_get_data(bio); @@ -472,7 +472,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr) static int bio_rdp_tls_new(BIO* bio) { - BIO_RDP_TLS* tls; + BIO_RDP_TLS* tls = NULL; BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); if (!(tls = calloc(1, sizeof(BIO_RDP_TLS)))) @@ -485,7 +485,7 @@ static int bio_rdp_tls_new(BIO* bio) static int bio_rdp_tls_free(BIO* bio) { - BIO_RDP_TLS* tls; + BIO_RDP_TLS* tls = NULL; if (!bio) return 0; @@ -517,7 +517,7 @@ static int bio_rdp_tls_free(BIO* bio) static long bio_rdp_tls_callback_ctrl(BIO* bio, int cmd, bio_info_cb* fp) { long status = 0; - BIO_RDP_TLS* tls; + BIO_RDP_TLS* tls = NULL; if (!bio) return 0; @@ -575,8 +575,8 @@ static BIO_METHOD* BIO_s_rdp_tls(void) static BIO* BIO_new_rdp_tls(SSL_CTX* ctx, int client) { - BIO* bio; - SSL* ssl; + BIO* bio = NULL; + SSL* ssl = NULL; bio = BIO_new(BIO_s_rdp_tls()); if (!bio) @@ -601,7 +601,7 @@ static BIO* BIO_new_rdp_tls(SSL_CTX* ctx, int client) static rdpCertificate* tls_get_certificate(rdpTls* tls, BOOL peer) { - X509* remote_cert; + X509* remote_cert = NULL; if (peer) remote_cert = SSL_get_peer_certificate(tls->ssl); @@ -642,7 +642,7 @@ static SecPkgContext_Bindings* tls_get_channel_bindings(const rdpCertificate* ce /* See https://www.rfc-editor.org/rfc/rfc5929 for details about hashes */ WINPR_MD_TYPE alg = freerdp_certificate_get_signature_alg(cert); - const char* hash; + const char* hash = NULL; switch (alg) { @@ -699,7 +699,7 @@ static BOOL CALLBACK secrets_file_init_cb(PINIT_ONCE once, PVOID param, PVOID* c static void SSLCTX_keylog_cb(const SSL* ssl, const char* line) { - char* dfile; + char* dfile = NULL; if (secrets_file_idx == -1) return; @@ -912,7 +912,7 @@ TlsHandshakeResult freerdp_tls_handshake(rdpTls* tls) return TLS_HANDSHAKE_CONTINUE; } - int verify_status; + int verify_status = 0; rdpCertificate* cert = tls_get_certificate(tls, tls->isClientMode); if (!cert) @@ -965,8 +965,8 @@ static int pollAndHandshake(rdpTls* tls) do { - HANDLE event; - DWORD status; + HANDLE event = NULL; + DWORD status = 0; if (BIO_get_event(tls->bio, &event) < 0) { WLog_ERR(TAG, "unable to retrieve BIO associated event"); @@ -1065,7 +1065,7 @@ TlsHandshakeResult freerdp_tls_accept_ex(rdpTls* tls, BIO* underlying, rdpSettin WINPR_ASSERT(tls); long options = 0; - int status; + int status = 0; /** * SSL_OP_NO_SSLv2: @@ -1216,7 +1216,7 @@ BOOL freerdp_tls_send_alert(rdpTls* tls) int freerdp_tls_write_all(rdpTls* tls, const BYTE* data, int length) { WINPR_ASSERT(tls); - int status; + int status = 0; int offset = 0; BIO* bio = tls->bio; @@ -1293,8 +1293,8 @@ static BOOL is_redirected(rdpTls* tls) static BOOL is_accepted(rdpTls* tls, const BYTE* pem, size_t length) { rdpSettings* settings = tls->settings; - char* AccpetedKey; - UINT32 AcceptedKeyLength; + char* AccpetedKey = NULL; + UINT32 AcceptedKeyLength = 0; if (tls->isGatewayTransport) { @@ -1346,8 +1346,8 @@ static BOOL is_accepted(rdpTls* tls, const BYTE* pem, size_t length) static BOOL compare_fingerprint(const char* fp, const char* hash, const rdpCertificate* cert, BOOL separator) { - BOOL equal; - char* strhash; + BOOL equal = 0; + char* strhash = NULL; WINPR_ASSERT(fp); WINPR_ASSERT(hash); @@ -1389,7 +1389,7 @@ static BOOL is_accepted_fingerprint(const rdpCertificate* cert, { char* subcontext = NULL; const char* h = strtok_s(cur, ":", &subcontext); - const char* fp; + const char* fp = NULL; if (!h) goto next; @@ -1448,9 +1448,9 @@ static BOOL tls_extract_pem(const rdpCertificate* cert, BYTE** PublicKey, size_t int tls_verify_certificate(rdpTls* tls, const rdpCertificate* cert, const char* hostname, UINT16 port) { - int match; - size_t length; - BOOL certificate_status; + int match = 0; + size_t length = 0; + BOOL certificate_status = 0; char* common_name = NULL; size_t common_name_length = 0; char** dns_names = 0; @@ -1461,7 +1461,7 @@ int tls_verify_certificate(rdpTls* tls, const rdpCertificate* cert, const char* rdpCertificateData* certificate_data = NULL; BYTE* pemCert = NULL; DWORD flags = VERIFY_CERT_FLAG_NONE; - freerdp* instance; + freerdp* instance = NULL; WINPR_ASSERT(tls); WINPR_ASSERT(tls->settings); @@ -1697,7 +1697,7 @@ int tls_verify_certificate(rdpTls* tls, const rdpCertificate* cert, const char* const BOOL fpIsAllocated = !old_pem || !freerdp_settings_get_bool( tls->settings, FreeRDP_CertificateCallbackPreferPEM); - char* fp; + char* fp = NULL; if (!fpIsAllocated) { cflags |= VERIFY_CERT_FLAG_FP_IS_PEM; @@ -1846,7 +1846,7 @@ void tls_print_certificate_name_mismatch_error(const char* hostname, UINT16 port rdpTls* freerdp_tls_new(rdpSettings* settings) { - rdpTls* tls; + rdpTls* tls = NULL; tls = (rdpTls*)calloc(1, sizeof(rdpTls)); if (!tls) diff --git a/libfreerdp/crypto/x509_utils.c b/libfreerdp/crypto/x509_utils.c index cdbc40cd3..b0a1ae2bd 100644 --- a/libfreerdp/crypto/x509_utils.c +++ b/libfreerdp/crypto/x509_utils.c @@ -39,7 +39,7 @@ BYTE* x509_utils_get_hash(const X509* xcert, const char* hash, size_t* length) { UINT32 fp_len = EVP_MAX_MD_SIZE; - BYTE* fp; + BYTE* fp = NULL; const EVP_MD* md = EVP_get_digestbyname(hash); if (!md) { @@ -95,7 +95,7 @@ static char* crypto_print_name(const X509_NAME* name) char* x509_utils_get_subject(const X509* xcert) { - char* subject; + char* subject = NULL; if (!xcert) { WLog_ERR(TAG, "Invalid certificate %p", xcert); @@ -178,9 +178,9 @@ typedef int (*general_name_mapper_pr)(GENERAL_NAME* name, void* data, int index, static void map_subject_alt_name(const X509* x509, int general_name_type, general_name_mapper_pr mapper, void* data) { - int i; - int num; - STACK_OF(GENERAL_NAME) * gens; + int i = 0; + int num = 0; + STACK_OF(GENERAL_NAME)* gens = NULL; gens = X509_get_ext_d2i(x509, NID_subject_alt_name, NULL, NULL); if (!gens) @@ -266,7 +266,7 @@ static int extract_string(GENERAL_NAME* name, void* data, int index, int count) { string_list* list = data; unsigned char* cstring = 0; - ASN1_STRING* str; + ASN1_STRING* str = NULL; switch (name->type) { @@ -360,9 +360,9 @@ static void object_list_allocate(object_list* list, int allocate_count) static char* object_string(ASN1_TYPE* object) { - char* result; - unsigned char* utf8String; - int length; + char* result = NULL; + unsigned char* utf8String = NULL; + int length = 0; /* TODO: check that object.type is a string type. */ length = ASN1_STRING_to_UTF8(&utf8String, object->value.asn1_string); @@ -516,7 +516,7 @@ char** x509_utils_get_dns_names(const X509* x509, size_t* count, size_t** length char* x509_utils_get_issuer(const X509* xcert) { - char* issuer; + char* issuer = NULL; if (!xcert) { WLog_ERR(TAG, "Invalid certificate %p", xcert); @@ -531,8 +531,8 @@ char* x509_utils_get_issuer(const X509* xcert) BOOL x509_utils_check_eku(const X509* xcert, int nid) { BOOL ret = FALSE; - STACK_OF(ASN1_OBJECT) * oid_stack; - ASN1_OBJECT* oid; + STACK_OF(ASN1_OBJECT)* oid_stack = NULL; + ASN1_OBJECT* oid = NULL; if (!xcert) return FALSE; @@ -554,9 +554,9 @@ BOOL x509_utils_check_eku(const X509* xcert, int nid) void x509_utils_print_info(const X509* xcert) { - char* fp; - char* issuer; - char* subject; + char* fp = NULL; + char* issuer = NULL; + char* subject = NULL; subject = x509_utils_get_subject(xcert); issuer = x509_utils_get_issuer(xcert); fp = (char*)x509_utils_get_hash(xcert, "sha256", NULL); @@ -583,11 +583,11 @@ out_free_issuer: static BYTE* x509_utils_get_pem(const X509* xcert, const STACK_OF(X509) * chain, size_t* plength) { - BIO* bio; - int status; - int count; - int x; - size_t offset; + BIO* bio = NULL; + int status = 0; + int count = 0; + int x = 0; + size_t offset = 0; size_t length = 0; BOOL rc = FALSE; BYTE* pemCert = NULL; @@ -653,8 +653,8 @@ static BYTE* x509_utils_get_pem(const X509* xcert, const STACK_OF(X509) * chain, while (offset >= length) { - int new_len; - BYTE* new_cert; + int new_len = 0; + BYTE* new_cert = NULL; new_len = length * 2; new_cert = (BYTE*)realloc(pemCert, new_len + 1); @@ -698,7 +698,7 @@ fail: X509* x509_utils_from_pem(const char* data, size_t len, BOOL fromFile) { X509* x509 = NULL; - BIO* bio; + BIO* bio = NULL; if (fromFile) bio = BIO_new_file(data, "rb"); else @@ -763,12 +763,12 @@ static WINPR_MD_TYPE hash_nid_to_winpr(int hash_nid) static WINPR_MD_TYPE get_rsa_pss_digest(const X509_ALGOR* alg) { WINPR_MD_TYPE ret = WINPR_MD_NONE; - WINPR_MD_TYPE message_digest; - WINPR_MD_TYPE mgf1_digest; - int param_type; - const void* param_value; - const ASN1_STRING* sequence; - const unsigned char* inp; + WINPR_MD_TYPE message_digest = WINPR_MD_NONE; + WINPR_MD_TYPE mgf1_digest = WINPR_MD_NONE; + int param_type = 0; + const void* param_value = NULL; + const ASN1_STRING* sequence = NULL; + const unsigned char* inp = NULL; RSA_PSS_PARAMS* params = NULL; X509_ALGOR* mgf1_digest_alg = NULL; @@ -795,7 +795,7 @@ static WINPR_MD_TYPE get_rsa_pss_digest(const X509_ALGOR* alg) message_digest = WINPR_MD_SHA1; if (params->hashAlgorithm != NULL) { - const ASN1_OBJECT* obj; + const ASN1_OBJECT* obj = NULL; X509_ALGOR_get0(&obj, NULL, NULL, params->hashAlgorithm); message_digest = hash_nid_to_winpr(OBJ_obj2nid(obj)); if (message_digest == WINPR_MD_NONE) @@ -805,10 +805,10 @@ static WINPR_MD_TYPE get_rsa_pss_digest(const X509_ALGOR* alg) mgf1_digest = WINPR_MD_SHA1; if (params->maskGenAlgorithm != NULL) { - const ASN1_OBJECT* obj; - int mgf_param_type; - const void* mgf_param_value; - const ASN1_STRING* mgf_param_sequence; + const ASN1_OBJECT* obj = NULL; + int mgf_param_type = 0; + const void* mgf_param_value = NULL; + const ASN1_STRING* mgf_param_sequence = NULL; /* First, check this is MGF-1, the only one ever defined. */ X509_ALGOR_get0(&obj, &mgf_param_type, &mgf_param_value, params->maskGenAlgorithm); if (OBJ_obj2nid(obj) != NID_mgf1) @@ -851,7 +851,7 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) if (nid == NID_rsassaPss) { - const X509_ALGOR* alg; + const X509_ALGOR* alg = NULL; X509_get0_signature(NULL, &alg, xcert); return get_rsa_pss_digest(alg); } diff --git a/libfreerdp/emu/scard/smartcard_emulate.c b/libfreerdp/emu/scard/smartcard_emulate.c index 5caff6f7f..25e4f1687 100644 --- a/libfreerdp/emu/scard/smartcard_emulate.c +++ b/libfreerdp/emu/scard/smartcard_emulate.c @@ -283,7 +283,7 @@ static void scard_handle_free(void* handle) static SCardHandle* scard_handle_new(SmartcardEmulationContext* smartcard, SCARDCONTEXT context, const void* name, BOOL unicode) { - SCardHandle* hdl; + SCardHandle* hdl = NULL; WINPR_ASSERT(smartcard); @@ -343,7 +343,7 @@ fail: static LONG scard_handle_valid(SmartcardEmulationContext* smartcard, SCARDHANDLE handle) { - SCardHandle* ctx; + SCardHandle* ctx = NULL; WINPR_ASSERT(smartcard); @@ -357,8 +357,8 @@ static LONG scard_handle_valid(SmartcardEmulationContext* smartcard, SCARDHANDLE static LONG scard_reader_name_valid_a(SmartcardEmulationContext* smartcard, SCARDCONTEXT context, const char* name) { - size_t x; - SCardContext* ctx; + size_t x = 0; + SCardContext* ctx = NULL; WINPR_ASSERT(smartcard); ctx = HashTable_GetItemValue(smartcard->contexts, (const void*)context); @@ -379,8 +379,8 @@ static LONG scard_reader_name_valid_a(SmartcardEmulationContext* smartcard, SCAR static LONG scard_reader_name_valid_w(SmartcardEmulationContext* smartcard, SCARDCONTEXT context, const WCHAR* name) { - size_t x; - SCardContext* ctx; + size_t x = 0; + SCardContext* ctx = NULL; WINPR_ASSERT(smartcard); ctx = HashTable_GetItemValue(smartcard->contexts, (const void*)context); @@ -407,7 +407,7 @@ LONG WINAPI Emulate_SCardEstablishContext(SmartcardEmulationContext* smartcard, LPSCARDCONTEXT phContext) { LONG status = SCARD_E_NO_MEMORY; - SCardContext* ctx; + SCardContext* ctx = NULL; WINPR_ASSERT(smartcard); @@ -443,8 +443,8 @@ LONG WINAPI Emulate_SCardEstablishContext(SmartcardEmulationContext* smartcard, LONG WINAPI Emulate_SCardReleaseContext(SmartcardEmulationContext* smartcard, SCARDCONTEXT hContext) { - LONG status; - SCardContext* value; + LONG status = 0; + SCardContext* value = NULL; WINPR_ASSERT(smartcard); @@ -467,7 +467,7 @@ LONG WINAPI Emulate_SCardReleaseContext(SmartcardEmulationContext* smartcard, SC LONG WINAPI Emulate_SCardIsValidContext(SmartcardEmulationContext* smartcard, SCARDCONTEXT hContext) { - LONG status; + LONG status = 0; WINPR_ASSERT(smartcard); @@ -1237,7 +1237,7 @@ LONG WINAPI Emulate_SCardFreeMemory(SmartcardEmulationContext* smartcard, SCARDC HANDLE WINAPI Emulate_SCardAccessStartedEvent(SmartcardEmulationContext* smartcard) { - HANDLE hEvent; + HANDLE hEvent = NULL; WINPR_ASSERT(smartcard); @@ -1371,7 +1371,7 @@ LONG WINAPI Emulate_SCardGetStatusChangeA(SmartcardEmulationContext* smartcard, if (status == SCARD_S_SUCCESS) { const DWORD diff = 100; - size_t x; + size_t x = 0; size_t eventCount = 0; SCardContext* value = HashTable_GetItemValue(smartcard->contexts, (const void*)hContext); WINPR_ASSERT(value); /* Must be valid after Emulate_SCardIsValidContext */ @@ -1381,7 +1381,7 @@ LONG WINAPI Emulate_SCardGetStatusChangeA(SmartcardEmulationContext* smartcard, { for (x = 0; x < cReaders; x++) { - size_t y; + size_t y = 0; LPSCARD_READERSTATEA out = &rgReaderStates[x]; for (y = 0; y < MAX_EMULATED_READERS; y++) @@ -1447,7 +1447,7 @@ LONG WINAPI Emulate_SCardGetStatusChangeW(SmartcardEmulationContext* smartcard, if (status == SCARD_S_SUCCESS) { const DWORD diff = 100; - size_t x; + size_t x = 0; size_t eventCount = 0; SCardContext* value = HashTable_GetItemValue(smartcard->contexts, (const void*)hContext); WINPR_ASSERT(value); /* Must be valid after Emulate_SCardIsValidContext */ @@ -1457,7 +1457,7 @@ LONG WINAPI Emulate_SCardGetStatusChangeW(SmartcardEmulationContext* smartcard, { for (x = 0; x < cReaders; x++) { - size_t y; + size_t y = 0; LPSCARD_READERSTATEW out = &rgReaderStates[x]; for (y = 0; y < MAX_EMULATED_READERS; y++) @@ -1534,8 +1534,8 @@ SCardHandle* find_reader(SmartcardEmulationContext* smartcard, const void* szRea { SCardHandle* hdl = NULL; UINT_PTR* keys = NULL; - size_t x; - size_t count; + size_t x = 0; + size_t count = 0; WINPR_ASSERT(smartcard); count = HashTable_GetKeys(smartcard->handles, &keys); @@ -1562,7 +1562,7 @@ static SCardHandle* reader2handle(SmartcardEmulationContext* smartcard, SCARDCON SCARDHANDLE* phCard, DWORD dwPreferredProtocols, LPDWORD pdwActiveProtocol) { - SCardHandle* hdl; + SCardHandle* hdl = NULL; WINPR_ASSERT(phCard); @@ -1812,7 +1812,7 @@ LONG WINAPI Emulate_SCardState(SmartcardEmulationContext* smartcard, SCARDHANDLE if (pcbAtrLen) { - size_t x; + size_t x = 0; SCardContext* ctx = HashTable_GetItemValue(smartcard->contexts, (const void*)hdl->hContext); WINPR_ASSERT(ctx); @@ -1858,7 +1858,7 @@ LONG WINAPI Emulate_SCardStatusA(SmartcardEmulationContext* smartcard, SCARDHAND if (status == SCARD_S_SUCCESS) { - SCardContext* ctx; + SCardContext* ctx = NULL; SCardHandle* hdl = HashTable_GetItemValue(smartcard->handles, (const void*)hCard); WINPR_ASSERT(hdl); @@ -1877,7 +1877,7 @@ LONG WINAPI Emulate_SCardStatusA(SmartcardEmulationContext* smartcard, SCARDHAND if (pcbAtrLen) { - size_t x; + size_t x = 0; for (x = 0; x < MAX_EMULATED_READERS; x++) { @@ -1908,7 +1908,7 @@ LONG WINAPI Emulate_SCardStatusW(SmartcardEmulationContext* smartcard, SCARDHAND if (status == SCARD_S_SUCCESS) { - SCardContext* ctx; + SCardContext* ctx = NULL; SCardHandle* hdl = HashTable_GetItemValue(smartcard->handles, (const void*)hCard); WINPR_ASSERT(hdl); @@ -1928,7 +1928,7 @@ LONG WINAPI Emulate_SCardStatusW(SmartcardEmulationContext* smartcard, SCARDHAND if (pcbAtrLen) { - size_t x; + size_t x = 0; for (x = 0; x < MAX_EMULATED_READERS; x++) { @@ -2093,7 +2093,7 @@ LONG WINAPI Emulate_SCardSetAttrib(SmartcardEmulationContext* smartcard, SCARDHA LONG WINAPI Emulate_SCardUIDlgSelectCardA(SmartcardEmulationContext* smartcard, LPOPENCARDNAMEA_EX pDlgStruc) { - LONG status; + LONG status = 0; WINPR_ASSERT(smartcard); @@ -2114,7 +2114,7 @@ LONG WINAPI Emulate_SCardUIDlgSelectCardA(SmartcardEmulationContext* smartcard, LONG WINAPI Emulate_SCardUIDlgSelectCardW(SmartcardEmulationContext* smartcard, LPOPENCARDNAMEW_EX pDlgStruc) { - LONG status; + LONG status = 0; WINPR_ASSERT(smartcard); @@ -2135,7 +2135,7 @@ LONG WINAPI Emulate_SCardUIDlgSelectCardW(SmartcardEmulationContext* smartcard, LONG WINAPI Emulate_GetOpenCardNameA(SmartcardEmulationContext* smartcard, LPOPENCARDNAMEA pDlgStruc) { - LONG status; + LONG status = 0; WINPR_ASSERT(smartcard); @@ -2156,7 +2156,7 @@ LONG WINAPI Emulate_GetOpenCardNameA(SmartcardEmulationContext* smartcard, LONG WINAPI Emulate_GetOpenCardNameW(SmartcardEmulationContext* smartcard, LPOPENCARDNAMEW pDlgStruc) { - LONG status; + LONG status = 0; WINPR_ASSERT(smartcard); @@ -2176,7 +2176,7 @@ LONG WINAPI Emulate_GetOpenCardNameW(SmartcardEmulationContext* smartcard, LONG WINAPI Emulate_SCardDlgExtendedError(SmartcardEmulationContext* smartcard) { - LONG status; + LONG status = 0; WINPR_ASSERT(smartcard); @@ -2213,7 +2213,7 @@ LONG WINAPI Emulate_SCardReadCacheA(SmartcardEmulationContext* smartcard, SCARDC if (status == SCARD_S_SUCCESS) { - SCardCacheItem* data; + SCardCacheItem* data = NULL; SCardContext* value = HashTable_GetItemValue(smartcard->contexts, (const void*)hContext); WINPR_ASSERT(value); /* Must be valid after Emulate_SCardIsValidContext */ @@ -2254,7 +2254,7 @@ LONG WINAPI Emulate_SCardReadCacheW(SmartcardEmulationContext* smartcard, SCARDC if (status == SCARD_S_SUCCESS) { - SCardCacheItem* data; + SCardCacheItem* data = NULL; SCardContext* value = HashTable_GetItemValue(smartcard->contexts, (const void*)hContext); WINPR_ASSERT(value); /* Must be valid after Emulate_SCardIsValidContext */ @@ -2277,8 +2277,8 @@ LONG WINAPI Emulate_SCardReadCacheW(SmartcardEmulationContext* smartcard, SCARDC static LONG insert_data(wHashTable* table, DWORD FreshnessCounter, const void* key, const PBYTE Data, DWORD DataLen) { - BOOL rc; - SCardCacheItem* item; + BOOL rc = 0; + SCardCacheItem* item = NULL; WINPR_ASSERT(table); WINPR_ASSERT(key); @@ -2631,7 +2631,7 @@ static BOOL handle_equals(const void* pva, const void* pvb) SmartcardEmulationContext* Emulate_New(const rdpSettings* settings) { - SmartcardEmulationContext* smartcard; + SmartcardEmulationContext* smartcard = NULL; WINPR_ASSERT(settings); @@ -2704,7 +2704,7 @@ void Emulate_Free(SmartcardEmulationContext* context) BOOL Emulate_IsConfigured(SmartcardEmulationContext* context) { BOOL rc = FALSE; - vgidsContext* vgids; + vgidsContext* vgids = NULL; const char* pem = NULL; const char* key = NULL; const char* pin = NULL; diff --git a/libfreerdp/emu/scard/smartcard_virtual_gids.c b/libfreerdp/emu/scard/smartcard_virtual_gids.c index 9206e2c53..01142c467 100644 --- a/libfreerdp/emu/scard/smartcard_virtual_gids.c +++ b/libfreerdp/emu/scard/smartcard_virtual_gids.c @@ -344,10 +344,10 @@ static BOOL vgids_ef_read_do(vgidsEF* ef, UINT16 doID, BYTE** data, DWORD* dataS /* Look for the requested DO */ while (Stream_GetRemainingLength(ef->data) > 3) { - BYTE len; - size_t curPos; - UINT16 doSize; - UINT16 nextDOID; + BYTE len = 0; + size_t curPos = 0; + UINT16 doSize = 0; + UINT16 nextDOID = 0; curPos = Stream_GetPosition(ef->data); Stream_Read_UINT16_BE(ef->data, nextDOID); @@ -379,7 +379,7 @@ static BOOL vgids_ef_read_do(vgidsEF* ef, UINT16 doID, BYTE** data, DWORD* dataS if (nextDOID == doID) { - BYTE* outData; + BYTE* outData = NULL; /* Include Tag and length in result */ doSize += (UINT16)(Stream_GetPosition(ef->data) - curPos); @@ -423,7 +423,7 @@ static BOOL vgids_prepare_fstable(const vgidsFilesysTableEntry* fstable, DWORD n BYTE unkonwn: 0x01 Array of vgidsFilesysTableEntry */ - DWORD i; + DWORD i = 0; BYTE* data = malloc(sizeof(vgidsFilesysTableEntry) * numEntries + 1); if (!data) { @@ -449,7 +449,7 @@ static BOOL vgids_prepare_certificate(const rdpCertificate* cert, BYTE** kxc, DW UINT16 source size ZLIB compressed cert */ - uLongf destSize; + uLongf destSize = 0; wStream* s = NULL; BYTE* comprData = NULL; @@ -535,7 +535,7 @@ static BOOL vgids_prepare_keymap(vgidsContext* context, BYTE** outData, DWORD* o BYTE unkonwn (count?): 0x01 Array of vgidsKeymapRecord */ - BYTE* data; + BYTE* data = NULL; vgidsKeymapRecord record = { 1, /* state */ 0, /* algo */ @@ -638,8 +638,8 @@ static BOOL vgids_create_response(UINT16 status, const BYTE* answer, DWORD answe static BOOL vgids_read_do_fkt(void* data, size_t index, va_list ap) { - BYTE* response; - DWORD responseSize; + BYTE* response = NULL; + DWORD responseSize = 0; vgidsEF* file = (vgidsEF*)data; vgidsContext* context = va_arg(ap, vgidsContext*); UINT16 efID = (UINT16)va_arg(ap, unsigned); @@ -679,9 +679,9 @@ static void vgids_reset_context_command_data(vgidsContext* context) static BOOL vgids_ins_select(vgidsContext* context, wStream* s, BYTE** response, DWORD* responseSize) { - BYTE p1; - BYTE p2; - BYTE lc; + BYTE p1 = 0; + BYTE p2 = 0; + BYTE lc = 0; DWORD resultDataSize = 0; const BYTE* resultData = NULL; UINT16 status = ISO_STATUS_SUCCESS; @@ -744,7 +744,7 @@ static BOOL vgids_ins_select(vgidsContext* context, wStream* s, BYTE** response, case 0x00: { /* read FID from APDU */ - UINT16 fid; + UINT16 fid = 0; if (lc > 2) { WLog_ERR(TAG, "The LC byte for the file ID is greater than 2"); @@ -855,11 +855,11 @@ handle_error: static BOOL vgids_ins_getdata(vgidsContext* context, wStream* s, BYTE** response, DWORD* responseSize) { - UINT16 doId; - UINT16 fileId; - BYTE p1; - BYTE p2; - BYTE lc; + UINT16 doId = 0; + UINT16 fileId = 0; + BYTE p1 = 0; + BYTE p2 = 0; + BYTE lc = 0; DWORD resultDataSize = 0; const BYTE* resultData = NULL; UINT16 status = ISO_STATUS_SUCCESS; @@ -882,8 +882,8 @@ static BOOL vgids_ins_getdata(vgidsContext* context, wStream* s, BYTE** response { case 4: { - BYTE tag; - BYTE length; + BYTE tag = 0; + BYTE length = 0; Stream_Read_UINT8(s, tag); Stream_Read_UINT8(s, length); if (tag != 0x5C && length != 0x02) @@ -898,10 +898,10 @@ static BOOL vgids_ins_getdata(vgidsContext* context, wStream* s, BYTE** response } case 0xA: { - UINT16 pubKeyDO; - BYTE tag; - BYTE length; - BYTE keyRef; + UINT16 pubKeyDO = 0; + BYTE tag = 0; + BYTE length = 0; + BYTE keyRef = 0; /* We want to retrieve the public key? */ if (p1 != 0x3F && p2 != 0xFF) @@ -973,11 +973,11 @@ static BOOL vgids_ins_getdata(vgidsContext* context, wStream* s, BYTE** response static BOOL vgids_ins_manage_security_environment(vgidsContext* context, wStream* s, BYTE** response, DWORD* responseSize) { - BYTE tag; - BYTE length; - BYTE p1; - BYTE p2; - BYTE lc; + BYTE tag = 0; + BYTE length = 0; + BYTE p1 = 0; + BYTE p2 = 0; + BYTE lc = 0; DWORD resultDataSize = 0; const BYTE* resultData = NULL; UINT16 status = ISO_STATUS_SUCCESS; @@ -1036,8 +1036,8 @@ create_response: static BOOL vgids_perform_digital_signature(vgidsContext* context) { - size_t sigSize; - size_t msgSize; + size_t sigSize = 0; + size_t msgSize = 0; EVP_PKEY_CTX* ctx = NULL; EVP_PKEY* pk = freerdp_key_get_evp_pkey(context->privateKey); const vgidsDigestInfoMap gidsDigestInfo[VGIDS_MAX_DIGEST_INFO] = { @@ -1148,7 +1148,7 @@ static BOOL vgids_perform_decrypt(vgidsContext* context) { EVP_PKEY_CTX* ctx = NULL; BOOL rc = FALSE; - int res; + int res = 0; int padding = RSA_NO_PADDING; vgids_reset_context_response(context); @@ -1214,10 +1214,10 @@ decrypt_failed: static BOOL vgids_ins_perform_security_operation(vgidsContext* context, wStream* s, BYTE** response, DWORD* responseSize) { - BYTE cla; - BYTE p1; - BYTE p2; - BYTE lc; + BYTE cla = 0; + BYTE p1 = 0; + BYTE p2 = 0; + BYTE lc = 0; DWORD resultDataSize = 0; const BYTE* resultData = NULL; UINT16 status = ISO_STATUS_SUCCESS; @@ -1305,13 +1305,13 @@ create_response: static BOOL vgids_ins_getresponse(vgidsContext* context, wStream* s, BYTE** response, DWORD* responseSize) { - BYTE p1; - BYTE p2; - BYTE le; + BYTE p1 = 0; + BYTE p2 = 0; + BYTE le = 0; DWORD resultDataSize = 0; const BYTE* resultData = NULL; - DWORD expectedLen; - DWORD remainingSize; + DWORD expectedLen = 0; + DWORD remainingSize = 0; UINT16 status = ISO_STATUS_SUCCESS; /* Get response continues data transfer after a previous get data command */ @@ -1362,10 +1362,10 @@ create_response: static BOOL vgids_ins_verify(vgidsContext* context, wStream* s, BYTE** response, DWORD* responseSize) { - BYTE ins; - BYTE p1; - BYTE p2; - BYTE lc; + BYTE ins = 0; + BYTE p1 = 0; + BYTE p2 = 0; + BYTE lc = 0; UINT16 status = ISO_STATUS_SUCCESS; char pin[VGIDS_MAX_PIN_SIZE + 1] = { 0 }; @@ -1430,7 +1430,7 @@ create_response: vgidsContext* vgids_new(void) { - wObject* obj; + wObject* obj = NULL; vgidsContext* ctx = calloc(1, sizeof(vgidsContext)); ctx->files = ArrayList_New(FALSE); @@ -1452,9 +1452,9 @@ create_failed: BOOL vgids_init(vgidsContext* ctx, const char* cert, const char* privateKey, const char* pin) { - DWORD kxcSize; - DWORD keymapSize; - DWORD fsTableSize; + DWORD kxcSize = 0; + DWORD keymapSize = 0; + DWORD fsTableSize = 0; BOOL rc = FALSE; BYTE* kxc = NULL; BYTE* keymap = NULL; diff --git a/libfreerdp/gdi/bitmap.c b/libfreerdp/gdi/bitmap.c index 64dddb809..7808a54d2 100644 --- a/libfreerdp/gdi/bitmap.c +++ b/libfreerdp/gdi/bitmap.c @@ -282,8 +282,8 @@ static INLINE BOOL BitBlt_write(HGDI_DC hdcDest, HGDI_DC hdcSrc, INT32 nXDest, I BOOL usePat, UINT32 style, const char* rop, const gdiPalette* palette) { - UINT32 dstColor; - UINT32 colorA; + UINT32 dstColor = 0; + UINT32 colorA = 0; UINT32 colorB = 0; UINT32 colorC = 0; const INT32 dstX = nXDest + x; @@ -347,9 +347,9 @@ static INLINE BOOL BitBlt_write(HGDI_DC hdcDest, HGDI_DC hdcSrc, INT32 nXDest, I static BOOL adjust_src_coordinates(HGDI_DC hdcSrc, INT32 nWidth, INT32 nHeight, INT32* px, INT32* py) { - HGDI_BITMAP hSrcBmp; - INT32 nXSrc; - INT32 nYSrc; + HGDI_BITMAP hSrcBmp = NULL; + INT32 nXSrc = 0; + INT32 nYSrc = 0; if (!hdcSrc || (nWidth < 0) || (nHeight < 0) || !px || !py) return FALSE; @@ -390,15 +390,15 @@ static BOOL adjust_src_coordinates(HGDI_DC hdcSrc, INT32 nWidth, INT32 nHeight, static BOOL adjust_src_dst_coordinates(HGDI_DC hdcDest, INT32* pnXSrc, INT32* pnYSrc, INT32* pnXDst, INT32* pnYDst, INT32* pnWidth, INT32* pnHeight) { - HGDI_BITMAP hDstBmp; - volatile INT32 diffX; - volatile INT32 diffY; - volatile INT32 nXSrc; - volatile INT32 nYSrc; - volatile INT32 nXDst; - volatile INT32 nYDst; - volatile INT32 nWidth; - volatile INT32 nHeight; + HGDI_BITMAP hDstBmp = NULL; + volatile INT32 diffX = 0; + volatile INT32 diffY = 0; + volatile INT32 nXSrc = 0; + volatile INT32 nYSrc = 0; + volatile INT32 nXDst = 0; + volatile INT32 nYDst = 0; + volatile INT32 nWidth = 0; + volatile INT32 nHeight = 0; if (!hdcDest || !pnXSrc || !pnYSrc || !pnXDst || !pnYDst || !pnWidth || !pnHeight) return FALSE; @@ -459,8 +459,8 @@ static BOOL BitBlt_process(HGDI_DC hdcDest, INT32 nXDest, INT32 nYDest, INT32 nW HGDI_DC hdcSrc, INT32 nXSrc, INT32 nYSrc, const char* rop, const gdiPalette* palette) { - INT32 x; - INT32 y; + INT32 x = 0; + INT32 y = 0; UINT32 style = 0; BOOL useSrc = FALSE; BOOL usePat = FALSE; @@ -585,8 +585,8 @@ static BOOL BitBlt_process(HGDI_DC hdcDest, INT32 nXDest, INT32 nYDest, INT32 nW BOOL gdi_BitBlt(HGDI_DC hdcDest, INT32 nXDest, INT32 nYDest, INT32 nWidth, INT32 nHeight, HGDI_DC hdcSrc, INT32 nXSrc, INT32 nYSrc, DWORD rop, const gdiPalette* palette) { - HGDI_BITMAP hSrcBmp; - HGDI_BITMAP hDstBmp; + HGDI_BITMAP hSrcBmp = NULL; + HGDI_BITMAP hDstBmp = NULL; if (!hdcDest) return FALSE; diff --git a/libfreerdp/gdi/clipping.c b/libfreerdp/gdi/clipping.c index 5278526a4..45774b659 100644 --- a/libfreerdp/gdi/clipping.c +++ b/libfreerdp/gdi/clipping.c @@ -80,7 +80,7 @@ BOOL gdi_ClipCoords(HGDI_DC hdc, INT32* x, INT32* y, INT32* w, INT32* h, INT32* GDI_RECT bmp; GDI_RECT clip; GDI_RECT coords; - HGDI_BITMAP hBmp; + HGDI_BITMAP hBmp = NULL; int dx = 0; int dy = 0; BOOL draw = TRUE; diff --git a/libfreerdp/gdi/dc.c b/libfreerdp/gdi/dc.c index e809bd256..94562b1f7 100644 --- a/libfreerdp/gdi/dc.c +++ b/libfreerdp/gdi/dc.c @@ -71,7 +71,7 @@ HGDI_DC gdi_GetDC(void) HGDI_DC gdi_CreateDC(UINT32 format) { - HGDI_DC hDC; + HGDI_DC hDC = NULL; if (!(hDC = (HGDI_DC)calloc(1, sizeof(GDI_DC)))) return NULL; diff --git a/libfreerdp/gdi/gdi.c b/libfreerdp/gdi/gdi.c index 3dcb35547..a6478a28f 100644 --- a/libfreerdp/gdi/gdi.c +++ b/libfreerdp/gdi/gdi.c @@ -325,7 +325,7 @@ static const BYTE GDI_BS_HATCHED_PATTERNS[] = { BOOL gdi_decode_color(rdpGdi* gdi, const UINT32 srcColor, UINT32* color, UINT32* format) { - UINT32 SrcFormat; + UINT32 SrcFormat = 0; if (!gdi || !color || !gdi->context || !gdi->context->settings) return FALSE; @@ -377,7 +377,7 @@ const char* gdi_rop3_code_string(BYTE code) const char* gdi_rop3_string(DWORD rop) { const size_t count = sizeof(rop3_code_table) / sizeof(rop3_code_table[0]); - size_t x; + size_t x = 0; for (x = 0; x < count; x++) { @@ -390,7 +390,7 @@ const char* gdi_rop3_string(DWORD rop) UINT32 gdi_get_pixel_format(UINT32 bitsPerPixel) { - UINT32 format; + UINT32 format = 0; switch (bitsPerPixel) { @@ -425,7 +425,7 @@ UINT32 gdi_get_pixel_format(UINT32 bitsPerPixel) gdiBitmap* gdi_bitmap_new_ex(rdpGdi* gdi, int width, int height, int bpp, BYTE* data) { - gdiBitmap* bitmap; + gdiBitmap* bitmap = NULL; bitmap = (gdiBitmap*)calloc(1, sizeof(gdiBitmap)); if (!bitmap) @@ -469,7 +469,7 @@ void gdi_bitmap_free_ex(gdiBitmap* bitmap) BOOL gdi_bitmap_update(rdpContext* context, const BITMAP_UPDATE* bitmapUpdate) { - UINT32 index; + UINT32 index = 0; if (!context || !bitmapUpdate || !context->gdi || !context->codecs) { @@ -526,8 +526,8 @@ BOOL gdi_bitmap_update(rdpContext* context, const BITMAP_UPDATE* bitmapUpdate) static BOOL gdi_palette_update(rdpContext* context, const PALETTE_UPDATE* palette) { - UINT32 index; - rdpGdi* gdi; + UINT32 index = 0; + rdpGdi* gdi = NULL; if (!context || !palette) return FALSE; @@ -547,7 +547,7 @@ static BOOL gdi_palette_update(rdpContext* context, const PALETTE_UPDATE* palett static BOOL gdi_set_bounds(rdpContext* context, const rdpBounds* bounds) { - rdpGdi* gdi; + rdpGdi* gdi = NULL; if (!context) return FALSE; @@ -567,7 +567,7 @@ static BOOL gdi_set_bounds(rdpContext* context, const rdpBounds* bounds) static BOOL gdi_dstblt(rdpContext* context, const DSTBLT_ORDER* dstblt) { - rdpGdi* gdi; + rdpGdi* gdi = NULL; if (!context || !dstblt) return FALSE; @@ -580,10 +580,10 @@ static BOOL gdi_dstblt(rdpContext* context, const DSTBLT_ORDER* dstblt) static BOOL gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt) { const rdpBrush* brush = &patblt->brush; - UINT32 foreColor; - UINT32 backColor; - UINT32 originalColor; - HGDI_BRUSH originalBrush; + UINT32 foreColor = 0; + UINT32 backColor = 0; + UINT32 originalColor = 0; + HGDI_BRUSH originalBrush = NULL; HGDI_BRUSH hbrush = NULL; rdpGdi* gdi = context->gdi; BOOL ret = FALSE; @@ -610,7 +610,7 @@ static BOOL gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt) case GDI_BS_HATCHED: { - const BYTE* hatched; + const BYTE* hatched = NULL; hatched = GDI_BS_HATCHED_PATTERNS + (8 * brush->hatch); if (!freerdp_image_copy_from_monochrome(data, gdi->drawing->hdc->format, 0, 0, 0, 8, 8, @@ -628,7 +628,7 @@ static BOOL gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt) case GDI_BS_PATTERN: { - UINT32 brushFormat; + UINT32 brushFormat = 0; if (brush->bpp > 1) { @@ -685,7 +685,7 @@ out_error: static BOOL gdi_scrblt(rdpContext* context, const SCRBLT_ORDER* scrblt) { - rdpGdi* gdi; + rdpGdi* gdi = NULL; if (!context || !context->gdi) return FALSE; @@ -699,10 +699,10 @@ static BOOL gdi_scrblt(rdpContext* context, const SCRBLT_ORDER* scrblt) static BOOL gdi_opaque_rect(rdpContext* context, const OPAQUE_RECT_ORDER* opaque_rect) { GDI_RECT rect; - HGDI_BRUSH hBrush; - UINT32 brush_color; + HGDI_BRUSH hBrush = NULL; + UINT32 brush_color = 0; rdpGdi* gdi = context->gdi; - BOOL ret; + BOOL ret = 0; INT32 x = opaque_rect->nLeftRect; INT32 y = opaque_rect->nTopRect; INT32 w = opaque_rect->nWidth; @@ -724,10 +724,10 @@ static BOOL gdi_opaque_rect(rdpContext* context, const OPAQUE_RECT_ORDER* opaque static BOOL gdi_multi_opaque_rect(rdpContext* context, const MULTI_OPAQUE_RECT_ORDER* multi_opaque_rect) { - UINT32 i; + UINT32 i = 0; GDI_RECT rect; - HGDI_BRUSH hBrush; - UINT32 brush_color; + HGDI_BRUSH hBrush = NULL; + UINT32 brush_color = 0; rdpGdi* gdi = context->gdi; BOOL ret = TRUE; @@ -760,8 +760,8 @@ static BOOL gdi_multi_opaque_rect(rdpContext* context, static BOOL gdi_line_to(rdpContext* context, const LINE_TO_ORDER* lineTo) { - UINT32 color; - HGDI_PEN hPen; + UINT32 color = 0; + HGDI_PEN hPen = NULL; rdpGdi* gdi = context->gdi; INT32 xStart = lineTo->nXStart; INT32 yStart = lineTo->nYStart; @@ -789,12 +789,12 @@ static BOOL gdi_line_to(rdpContext* context, const LINE_TO_ORDER* lineTo) static BOOL gdi_polyline(rdpContext* context, const POLYLINE_ORDER* polyline) { - UINT32 i; - INT32 x; - INT32 y; - UINT32 color; - HGDI_PEN hPen; - DELTA_POINT* points; + UINT32 i = 0; + INT32 x = 0; + INT32 y = 0; + UINT32 color = 0; + HGDI_PEN hPen = NULL; + DELTA_POINT* points = NULL; rdpGdi* gdi = context->gdi; INT32 w = 0; INT32 h = 0; @@ -828,8 +828,8 @@ static BOOL gdi_polyline(rdpContext* context, const POLYLINE_ORDER* polyline) static BOOL gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) { - gdiBitmap* bitmap; - rdpGdi* gdi; + gdiBitmap* bitmap = NULL; + rdpGdi* gdi = NULL; if (!context || !memblt || !context->gdi || !memblt->bitmap) return FALSE; @@ -843,14 +843,14 @@ static BOOL gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) static BOOL gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt) { - HGDI_BRUSH originalBrush; + HGDI_BRUSH originalBrush = NULL; rdpGdi* gdi = context->gdi; BOOL ret = TRUE; const rdpBrush* brush = &mem3blt->brush; gdiBitmap* bitmap = (gdiBitmap*)mem3blt->bitmap; - UINT32 foreColor; - UINT32 backColor; - UINT32 originalColor; + UINT32 foreColor = 0; + UINT32 backColor = 0; + UINT32 originalColor = 0; if (!gdi_decode_color(gdi, mem3blt->foreColor, &foreColor, NULL)) return FALSE; @@ -881,8 +881,8 @@ static BOOL gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt) case GDI_BS_PATTERN: { - HGDI_BITMAP hBmp; - UINT32 brushFormat; + HGDI_BITMAP hBmp = NULL; + UINT32 brushFormat = 0; BYTE* data = (BYTE*)winpr_aligned_malloc( 8 * 8 * FreeRDPGetBytesPerPixel(gdi->drawing->hdc->format), 16); @@ -1048,12 +1048,12 @@ static BOOL intersect_rect(const rdpGdi* gdi, const SURFACE_BITS_COMMAND* cmd, R static BOOL gdi_surface_bits(rdpContext* context, const SURFACE_BITS_COMMAND* cmd) { BOOL result = FALSE; - DWORD format; + DWORD format = 0; rdpGdi* gdi = NULL; - size_t size; + size_t size = 0; REGION16 region; RECTANGLE_16 cmdRect = { 0 }; - UINT32 nbRects; + UINT32 nbRects = 0; const RECTANGLE_16* rects = NULL; if (!context || !cmd) @@ -1160,8 +1160,8 @@ out: static void gdi_register_update_callbacks(rdpUpdate* update) { - rdpPrimaryUpdate* primary; - const rdpSettings* settings; + rdpPrimaryUpdate* primary = NULL; + const rdpSettings* settings = NULL; WINPR_ASSERT(update); WINPR_ASSERT(update->context); @@ -1337,9 +1337,9 @@ BOOL gdi_init(freerdp* instance, UINT32 format) BOOL gdi_init_ex(freerdp* instance, UINT32 format, UINT32 stride, BYTE* buffer, void (*pfree)(void*)) { - rdpContext* context; - UINT32 SrcFormat; - rdpGdi* gdi; + rdpContext* context = NULL; + UINT32 SrcFormat = 0; + rdpGdi* gdi = NULL; WINPR_ASSERT(instance); @@ -1400,8 +1400,8 @@ fail: void gdi_free(freerdp* instance) { - rdpGdi* gdi; - rdpContext* context; + rdpGdi* gdi = NULL; + rdpContext* context = NULL; if (!instance || !instance->context) return; @@ -1424,8 +1424,8 @@ void gdi_free(freerdp* instance) BOOL gdi_send_suppress_output(rdpGdi* gdi, BOOL suppress) { RECTANGLE_16 rect; - rdpSettings* settings; - rdpUpdate* update; + rdpSettings* settings = NULL; + rdpUpdate* update = NULL; if (!gdi || !gdi->context->settings || !gdi->context->update) return FALSE; diff --git a/libfreerdp/gdi/gfx.c b/libfreerdp/gdi/gfx.c index 8db35ff26..84230d157 100644 --- a/libfreerdp/gdi/gfx.c +++ b/libfreerdp/gdi/gfx.c @@ -28,6 +28,7 @@ #include #include #include +#include #define TAG FREERDP_TAG("gdi") @@ -84,14 +85,14 @@ static UINT gdi_ResetGraphics(RdpgfxClientContext* context, const RDPGFX_RESET_GRAPHICS_PDU* resetGraphics) { UINT rc = ERROR_INTERNAL_ERROR; - UINT32 index; - UINT16 count; - UINT32 DesktopWidth; - UINT32 DesktopHeight; + UINT32 index = 0; + UINT16 count = 0; + UINT32 DesktopWidth = 0; + UINT32 DesktopHeight = 0; UINT16* pSurfaceIds = NULL; - rdpGdi* gdi; - rdpUpdate* update; - rdpSettings* settings; + rdpGdi* gdi = NULL; + rdpUpdate* update = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(context); WINPR_ASSERT(resetGraphics); @@ -163,15 +164,15 @@ fail: static UINT gdi_OutputUpdate(rdpGdi* gdi, gdiGfxSurface* surface) { UINT rc = ERROR_INTERNAL_ERROR; - UINT32 surfaceX; - UINT32 surfaceY; + UINT32 surfaceX = 0; + UINT32 surfaceY = 0; RECTANGLE_16 surfaceRect; - const RECTANGLE_16* rects; - UINT32 i; - UINT32 nbRects; - double sx; - double sy; - rdpUpdate* update; + const RECTANGLE_16* rects = NULL; + UINT32 i = 0; + UINT32 nbRects = 0; + double sx = NAN; + double sy = NAN; + rdpUpdate* update = NULL; WINPR_ASSERT(gdi); WINPR_ASSERT(gdi->context); @@ -241,11 +242,11 @@ static UINT gdi_WindowUpdate(RdpgfxClientContext* context, gdiGfxSurface* surfac static UINT gdi_UpdateSurfaces(RdpgfxClientContext* context) { - UINT16 count; - UINT16 index; + UINT16 count = 0; + UINT16 index = 0; UINT status = ERROR_INTERNAL_ERROR; UINT16* pSurfaceIds = NULL; - rdpGdi* gdi; + rdpGdi* gdi = NULL; WINPR_ASSERT(context); @@ -295,7 +296,7 @@ static UINT gdi_UpdateSurfaces(RdpgfxClientContext* context) */ static UINT gdi_StartFrame(RdpgfxClientContext* context, const RDPGFX_START_FRAME_PDU* startFrame) { - rdpGdi* gdi; + rdpGdi* gdi = NULL; WINPR_ASSERT(context); WINPR_ASSERT(startFrame); @@ -315,7 +316,7 @@ static UINT gdi_StartFrame(RdpgfxClientContext* context, const RDPGFX_START_FRAM static UINT gdi_EndFrame(RdpgfxClientContext* context, const RDPGFX_END_FRAME_PDU* endFrame) { UINT status = CHANNEL_RC_OK; - rdpGdi* gdi; + rdpGdi* gdi = NULL; WINPR_ASSERT(context); WINPR_ASSERT(endFrame); @@ -336,10 +337,10 @@ static UINT gdi_SurfaceCommand_Uncompressed(rdpGdi* gdi, RdpgfxClientContext* co const RDPGFX_SURFACE_COMMAND* cmd) { UINT status = CHANNEL_RC_OK; - gdiGfxSurface* surface; + gdiGfxSurface* surface = NULL; RECTANGLE_16 invalidRect; - DWORD bpp; - size_t size; + DWORD bpp = 0; + size_t size = 0; WINPR_ASSERT(gdi); WINPR_ASSERT(context); WINPR_ASSERT(cmd); @@ -400,11 +401,11 @@ static UINT gdi_SurfaceCommand_RemoteFX(rdpGdi* gdi, RdpgfxClientContext* contex const RDPGFX_SURFACE_COMMAND* cmd) { UINT status = ERROR_INTERNAL_ERROR; - gdiGfxSurface* surface; + gdiGfxSurface* surface = NULL; REGION16 invalidRegion; - const RECTANGLE_16* rects; - UINT32 nrRects; - UINT32 x; + const RECTANGLE_16* rects = NULL; + UINT32 nrRects = 0; + UINT32 x = 0; WINPR_ASSERT(gdi); WINPR_ASSERT(context); WINPR_ASSERT(cmd); @@ -460,9 +461,9 @@ fail: static UINT gdi_SurfaceCommand_ClearCodec(rdpGdi* gdi, RdpgfxClientContext* context, const RDPGFX_SURFACE_COMMAND* cmd) { - INT32 rc; + INT32 rc = 0; UINT status = CHANNEL_RC_OK; - gdiGfxSurface* surface; + gdiGfxSurface* surface = NULL; RECTANGLE_16 invalidRect; WINPR_ASSERT(gdi); WINPR_ASSERT(context); @@ -520,7 +521,7 @@ static UINT gdi_SurfaceCommand_Planar(rdpGdi* gdi, RdpgfxClientContext* context, { UINT status = CHANNEL_RC_OK; BYTE* DstData = NULL; - gdiGfxSurface* surface; + gdiGfxSurface* surface = NULL; RECTANGLE_16 invalidRect; WINPR_ASSERT(gdi); WINPR_ASSERT(context); @@ -576,12 +577,12 @@ static UINT gdi_SurfaceCommand_AVC420(rdpGdi* gdi, RdpgfxClientContext* context, const RDPGFX_SURFACE_COMMAND* cmd) { #ifdef WITH_GFX_H264 - INT32 rc; + INT32 rc = 0; UINT status = CHANNEL_RC_OK; - UINT32 i; - gdiGfxSurface* surface; - RDPGFX_H264_METABLOCK* meta; - RDPGFX_AVC420_BITMAP_STREAM* bs; + UINT32 i = 0; + gdiGfxSurface* surface = NULL; + RDPGFX_H264_METABLOCK* meta = NULL; + RDPGFX_AVC420_BITMAP_STREAM* bs = NULL; WINPR_ASSERT(gdi); WINPR_ASSERT(context); WINPR_ASSERT(cmd); @@ -663,9 +664,9 @@ static UINT gdi_SurfaceCommand_AVC444(rdpGdi* gdi, RdpgfxClientContext* context, const RDPGFX_SURFACE_COMMAND* cmd) { #ifdef WITH_GFX_H264 - INT32 rc; + INT32 rc = 0; UINT status = CHANNEL_RC_OK; - UINT32 i; + UINT32 i = 0; gdiGfxSurface* surface = NULL; RDPGFX_AVC444_BITMAP_STREAM* bs = NULL; RDPGFX_AVC420_BITMAP_STREAM* avc1 = NULL; @@ -803,12 +804,12 @@ static UINT gdi_SurfaceCommand_Alpha(rdpGdi* gdi, RdpgfxClientContext* context, const RDPGFX_SURFACE_COMMAND* cmd) { UINT status = CHANNEL_RC_OK; - UINT16 alphaSig; - UINT16 compressed; - gdiGfxSurface* surface; + UINT16 alphaSig = 0; + UINT16 compressed = 0; + gdiGfxSurface* surface = NULL; RECTANGLE_16 invalidRect; wStream buffer; - wStream* s; + wStream* s = NULL; WINPR_ASSERT(gdi); WINPR_ASSERT(context); WINPR_ASSERT(cmd); @@ -848,11 +849,11 @@ static UINT gdi_SurfaceCommand_Alpha(rdpGdi* gdi, RdpgfxClientContext* context, for (UINT32 x = cmd->left; x < cmd->left + cmd->width; x++) { - UINT32 color; - BYTE r; - BYTE g; - BYTE b; - BYTE a; + UINT32 color = 0; + BYTE r = 0; + BYTE g = 0; + BYTE b = 0; + BYTE a = 0; BYTE* src = &line[x * FreeRDPGetBytesPerPixel(surface->format)]; Stream_Read_UINT8(s, a); color = FreeRDPReadColor(src, surface->format); @@ -873,8 +874,8 @@ static UINT gdi_SurfaceCommand_Alpha(rdpGdi* gdi, RdpgfxClientContext* context, while (rect.top < rect.bottom) { - UINT32 count; - BYTE a; + UINT32 count = 0; + BYTE a = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 2)) return ERROR_INVALID_DATA; @@ -941,13 +942,13 @@ fail: static UINT gdi_SurfaceCommand_Progressive(rdpGdi* gdi, RdpgfxClientContext* context, const RDPGFX_SURFACE_COMMAND* cmd) { - INT32 rc; + INT32 rc = 0; UINT status = CHANNEL_RC_OK; - gdiGfxSurface* surface; + gdiGfxSurface* surface = NULL; REGION16 invalidRegion; - const RECTANGLE_16* rects; - UINT32 nrRects; - UINT32 x; + const RECTANGLE_16* rects = NULL; + UINT32 nrRects = 0; + UINT32 x = 0; /** * Note: Since this comes via a Wire-To-Surface-2 PDU the * cmd's top/left/right/bottom/width/height members are always zero! @@ -1023,7 +1024,7 @@ fail: static UINT gdi_SurfaceCommand(RdpgfxClientContext* context, const RDPGFX_SURFACE_COMMAND* cmd) { UINT status = CHANNEL_RC_OK; - rdpGdi* gdi; + rdpGdi* gdi = NULL; if (!context || !cmd) return ERROR_INVALID_PARAMETER; @@ -1116,8 +1117,8 @@ static UINT gdi_CreateSurface(RdpgfxClientContext* context, const RDPGFX_CREATE_SURFACE_PDU* createSurface) { UINT rc = ERROR_INTERNAL_ERROR; - gdiGfxSurface* surface; - rdpGdi* gdi; + gdiGfxSurface* surface = NULL; + rdpGdi* gdi = NULL; WINPR_ASSERT(context); WINPR_ASSERT(createSurface); gdi = (rdpGdi*)context->custom; @@ -1324,14 +1325,14 @@ static UINT gdi_SurfaceToSurface(RdpgfxClientContext* context, const RDPGFX_SURFACE_TO_SURFACE_PDU* surfaceToSurface) { UINT status = ERROR_INTERNAL_ERROR; - UINT16 index; - BOOL sameSurface; - UINT32 nWidth; - UINT32 nHeight; - const RECTANGLE_16* rectSrc; + UINT16 index = 0; + BOOL sameSurface = 0; + UINT32 nWidth = 0; + UINT32 nHeight = 0; + const RECTANGLE_16* rectSrc = NULL; RECTANGLE_16 invalidRect; - gdiGfxSurface* surfaceSrc; - gdiGfxSurface* surfaceDst; + gdiGfxSurface* surfaceSrc = NULL; + gdiGfxSurface* surfaceDst = NULL; rdpGdi* gdi = (rdpGdi*)context->custom; EnterCriticalSection(&context->mux); rectSrc = &(surfaceToSurface->rectSrc); @@ -1436,8 +1437,8 @@ fail: static UINT gdi_SurfaceToCache(RdpgfxClientContext* context, const RDPGFX_SURFACE_TO_CACHE_PDU* surfaceToCache) { - const RECTANGLE_16* rect; - gdiGfxSurface* surface; + const RECTANGLE_16* rect = NULL; + gdiGfxSurface* surface = NULL; gdiGfxCacheEntry* cacheEntry = NULL; UINT rc = ERROR_INTERNAL_ERROR; EnterCriticalSection(&context->mux); @@ -1488,9 +1489,9 @@ static UINT gdi_CacheToSurface(RdpgfxClientContext* context, const RDPGFX_CACHE_TO_SURFACE_PDU* cacheToSurface) { UINT status = ERROR_INTERNAL_ERROR; - UINT16 index; - gdiGfxSurface* surface; - gdiGfxCacheEntry* cacheEntry; + UINT16 index = 0; + gdiGfxSurface* surface = NULL; + gdiGfxCacheEntry* cacheEntry = NULL; RECTANGLE_16 invalidRect; rdpGdi* gdi = (rdpGdi*)context->custom; @@ -1555,9 +1556,9 @@ fail: static UINT gdi_CacheImportReply(RdpgfxClientContext* context, const RDPGFX_CACHE_IMPORT_REPLY_PDU* cacheImportReply) { - UINT16 index; - UINT16 count; - const UINT16* slots; + UINT16 index = 0; + UINT16 count = 0; + const UINT16* slots = NULL; UINT error = CHANNEL_RC_OK; slots = cacheImportReply->cacheSlots; @@ -1601,7 +1602,7 @@ static UINT gdi_ImportCacheEntry(RdpgfxClientContext* context, UINT16 cacheSlot, PERSISTENT_CACHE_ENTRY* importCacheEntry) { UINT error = ERROR_INTERNAL_ERROR; - gdiGfxCacheEntry* cacheEntry; + gdiGfxCacheEntry* cacheEntry = NULL; if (cacheSlot == 0) return CHANNEL_RC_OK; @@ -1639,7 +1640,7 @@ fail: static UINT gdi_ExportCacheEntry(RdpgfxClientContext* context, UINT16 cacheSlot, PERSISTENT_CACHE_ENTRY* exportCacheEntry) { - gdiGfxCacheEntry* cacheEntry; + gdiGfxCacheEntry* cacheEntry = NULL; WINPR_ASSERT(context->GetCacheSlotData); cacheEntry = (gdiGfxCacheEntry*)context->GetCacheSlotData(context, cacheSlot); @@ -1666,7 +1667,7 @@ static UINT gdi_ExportCacheEntry(RdpgfxClientContext* context, UINT16 cacheSlot, static UINT gdi_EvictCacheEntry(RdpgfxClientContext* context, const RDPGFX_EVICT_CACHE_ENTRY_PDU* evictCacheEntry) { - gdiGfxCacheEntry* cacheEntry; + gdiGfxCacheEntry* cacheEntry = NULL; UINT rc = ERROR_NOT_FOUND; WINPR_ASSERT(context); @@ -1762,7 +1763,7 @@ static UINT gdi_MapSurfaceToWindow(RdpgfxClientContext* context, const RDPGFX_MAP_SURFACE_TO_WINDOW_PDU* surfaceToWindow) { UINT rc = ERROR_INTERNAL_ERROR; - gdiGfxSurface* surface; + gdiGfxSurface* surface = NULL; EnterCriticalSection(&context->mux); WINPR_ASSERT(context->GetSurfaceData); @@ -1805,7 +1806,7 @@ gdi_MapSurfaceToScaledWindow(RdpgfxClientContext* context, const RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU* surfaceToWindow) { UINT rc = ERROR_INTERNAL_ERROR; - gdiGfxSurface* surface; + gdiGfxSurface* surface = NULL; EnterCriticalSection(&context->mux); WINPR_ASSERT(context->GetSurfaceData); @@ -1853,8 +1854,8 @@ BOOL gdi_graphics_pipeline_init_ex(rdpGdi* gdi, RdpgfxClientContext* gfx, pcRdpgfxUnmapWindowForSurface unmap, pcRdpgfxUpdateSurfaceArea update) { - rdpContext* context; - const rdpSettings* settings; + rdpContext* context = NULL; + const rdpSettings* settings = NULL; if (!gdi || !gfx || !gdi->context || !gdi->context->settings) return FALSE; diff --git a/libfreerdp/gdi/graphics.c b/libfreerdp/gdi/graphics.c index 95150617f..28860cf12 100644 --- a/libfreerdp/gdi/graphics.c +++ b/libfreerdp/gdi/graphics.c @@ -41,11 +41,11 @@ HGDI_BITMAP gdi_create_bitmap(rdpGdi* gdi, UINT32 nWidth, UINT32 nHeight, UINT32 SrcFormat, BYTE* data) { - UINT32 nSrcStep; - UINT32 nDstStep; - BYTE* pSrcData; - BYTE* pDstData; - HGDI_BITMAP bitmap; + UINT32 nSrcStep = 0; + UINT32 nDstStep = 0; + BYTE* pSrcData = NULL; + BYTE* pDstData = NULL; + HGDI_BITMAP bitmap = NULL; if (!gdi) return NULL; @@ -72,7 +72,7 @@ HGDI_BITMAP gdi_create_bitmap(rdpGdi* gdi, UINT32 nWidth, UINT32 nHeight, UINT32 static BOOL gdi_Bitmap_New(rdpContext* context, rdpBitmap* bitmap) { - gdiBitmap* gdi_bitmap; + gdiBitmap* gdi_bitmap = NULL; rdpGdi* gdi = context->gdi; gdi_bitmap = (gdiBitmap*)bitmap; gdi_bitmap->hdc = gdi_CreateCompatibleDC(gdi->hdc); @@ -132,7 +132,7 @@ static BOOL gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, const UINT32 DstWidth, UINT32 DstHeight, UINT32 bpp, UINT32 length, BOOL compressed, UINT32 codecId) { - int status; + int status = 0; UINT32 SrcSize = length; rdpGdi* gdi = context->gdi; UINT32 size = DstWidth * DstHeight; @@ -244,7 +244,7 @@ static BOOL gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, const static BOOL gdi_Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, BOOL primary) { - rdpGdi* gdi; + rdpGdi* gdi = NULL; if (!context) return FALSE; @@ -265,8 +265,8 @@ static BOOL gdi_Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, BOOL p /* Glyph Class */ static BOOL gdi_Glyph_New(rdpContext* context, rdpGlyph* glyph) { - BYTE* data; - gdiGlyph* gdi_glyph; + BYTE* data = NULL; + gdiGlyph* gdi_glyph = NULL; if (!context || !glyph) return FALSE; @@ -302,7 +302,7 @@ static BOOL gdi_Glyph_New(rdpContext* context, rdpGlyph* glyph) static void gdi_Glyph_Free(rdpContext* context, rdpGlyph* glyph) { - gdiGlyph* gdi_glyph; + gdiGlyph* gdi_glyph = NULL; gdi_glyph = (gdiGlyph*)glyph; if (gdi_glyph) @@ -318,9 +318,9 @@ static void gdi_Glyph_Free(rdpContext* context, rdpGlyph* glyph) static BOOL gdi_Glyph_Draw(rdpContext* context, const rdpGlyph* glyph, INT32 x, INT32 y, INT32 w, INT32 h, INT32 sx, INT32 sy, BOOL fOpRedundant) { - const gdiGlyph* gdi_glyph; - rdpGdi* gdi; - HGDI_BRUSH brush; + const gdiGlyph* gdi_glyph = NULL; + rdpGdi* gdi = NULL; + HGDI_BRUSH brush = NULL; BOOL rc = FALSE; if (!context || !glyph) @@ -372,7 +372,7 @@ static BOOL gdi_Glyph_Draw(rdpContext* context, const rdpGlyph* glyph, INT32 x, static BOOL gdi_Glyph_BeginDraw(rdpContext* context, INT32 x, INT32 y, INT32 width, INT32 height, UINT32 bgcolor, UINT32 fgcolor, BOOL fOpRedundant) { - rdpGdi* gdi; + rdpGdi* gdi = NULL; if (!context || !context->gdi) return FALSE; @@ -426,7 +426,7 @@ static BOOL gdi_Glyph_BeginDraw(rdpContext* context, INT32 x, INT32 y, INT32 wid static BOOL gdi_Glyph_EndDraw(rdpContext* context, INT32 x, INT32 y, INT32 width, INT32 height, UINT32 bgcolor, UINT32 fgcolor) { - rdpGdi* gdi; + rdpGdi* gdi = NULL; if (!context || !context->gdi) return FALSE; diff --git a/libfreerdp/gdi/line.c b/libfreerdp/gdi/line.c index 6c9869571..95c828858 100644 --- a/libfreerdp/gdi/line.c +++ b/libfreerdp/gdi/line.c @@ -41,7 +41,7 @@ static BOOL gdi_rop_color(UINT32 rop, BYTE* pixelPtr, UINT32 pen, UINT32 format) { WINPR_ASSERT(pixelPtr); const UINT32 srcPixel = FreeRDPReadColor(pixelPtr, format); - UINT32 dstPixel; + UINT32 dstPixel = 0; switch (rop) { @@ -118,8 +118,8 @@ static BOOL gdi_rop_color(UINT32 rop, BYTE* pixelPtr, UINT32 pen, UINT32 format) BOOL gdi_LineTo(HGDI_DC hdc, UINT32 nXEnd, UINT32 nYEnd) { - INT32 e2; - UINT32 pen; + INT32 e2 = 0; + UINT32 pen = 0; WINPR_ASSERT(hdc); const INT32 rop2 = gdi_GetROP2(hdc); @@ -137,10 +137,10 @@ BOOL gdi_LineTo(HGDI_DC hdc, UINT32 nXEnd, UINT32 nYEnd) INT32 y = y1; WINPR_ASSERT(hdc->clip); - INT32 bx1; - INT32 by1; - INT32 bx2; - INT32 by2; + INT32 bx1 = 0; + INT32 by1 = 0; + INT32 bx2 = 0; + INT32 by2 = 0; if (hdc->clip->null) { bx1 = (x1 < x2) ? x1 : x2; diff --git a/libfreerdp/gdi/region.c b/libfreerdp/gdi/region.c index 32b2d96e7..31d638f42 100644 --- a/libfreerdp/gdi/region.c +++ b/libfreerdp/gdi/region.c @@ -74,9 +74,9 @@ static char* gdi_regn_str(char* buffer, size_t size, const HGDI_RGN rgn) HGDI_RGN gdi_CreateRectRgn(INT32 nLeftRect, INT32 nTopRect, INT32 nRightRect, INT32 nBottomRect) { - INT64 w; - INT64 h; - HGDI_RGN hRgn; + INT64 w = 0; + INT64 h = 0; + HGDI_RGN hRgn = NULL; w = nRightRect - nLeftRect + 1ll; h = nBottomRect - nTopRect + 1ll; @@ -113,7 +113,7 @@ HGDI_RGN gdi_CreateRectRgn(INT32 nLeftRect, INT32 nTopRect, INT32 nRightRect, IN HGDI_RECT gdi_CreateRect(INT32 xLeft, INT32 yTop, INT32 xRight, INT32 yBottom) { - HGDI_RECT hRect; + HGDI_RECT hRect = NULL; if (xLeft > xRight) return NULL; @@ -142,8 +142,8 @@ HGDI_RECT gdi_CreateRect(INT32 xLeft, INT32 yTop, INT32 xRight, INT32 yBottom) BOOL gdi_RectToRgn(const HGDI_RECT rect, HGDI_RGN rgn) { BOOL rc = TRUE; - INT64 w; - INT64 h; + INT64 w = 0; + INT64 h = 0; w = rect->right - rect->left + 1ll; h = rect->bottom - rect->top + 1ll; @@ -178,8 +178,8 @@ BOOL gdi_RectToRgn(const HGDI_RECT rect, HGDI_RGN rgn) BOOL gdi_CRectToRgn(INT32 left, INT32 top, INT32 right, INT32 bottom, HGDI_RGN rgn) { BOOL rc = TRUE; - INT64 w; - INT64 h; + INT64 w = 0; + INT64 h = 0; w = right - left + 1ll; h = bottom - top + 1ll; @@ -256,8 +256,8 @@ BOOL gdi_RectToCRgn(const HGDI_RECT rect, INT32* x, INT32* y, INT32* w, INT32* h BOOL gdi_CRectToCRgn(INT32 left, INT32 top, INT32 right, INT32 bottom, INT32* x, INT32* y, INT32* w, INT32* h) { - INT64 wl; - INT64 hl; + INT64 wl = 0; + INT64 hl = 0; BOOL rc = TRUE; wl = right - left + 1ll; hl = bottom - top + 1ll; @@ -289,8 +289,8 @@ BOOL gdi_CRectToCRgn(INT32 left, INT32 top, INT32 right, INT32 bottom, INT32* x, BOOL gdi_RgnToRect(const HGDI_RGN rgn, HGDI_RECT rect) { - INT64 r; - INT64 b; + INT64 r = 0; + INT64 b = 0; BOOL rc = TRUE; r = rgn->x + rgn->w - 1ll; b = rgn->y + rgn->h - 1ll; @@ -606,8 +606,8 @@ INLINE BOOL gdi_InvalidateRegion(HGDI_DC hdc, INT32 x, INT32 y, INT32 w, INT32 h { GDI_RECT inv; GDI_RECT rgn; - HGDI_RGN invalid; - HGDI_RGN cinvalid; + HGDI_RGN invalid = NULL; + HGDI_RGN cinvalid = NULL; if (!hdc->hwnd) return TRUE; @@ -622,8 +622,8 @@ INLINE BOOL gdi_InvalidateRegion(HGDI_DC hdc, INT32 x, INT32 y, INT32 w, INT32 h if ((hdc->hwnd->ninvalid + 1) > (INT64)hdc->hwnd->count) { - size_t new_cnt; - HGDI_RGN new_rgn; + size_t new_cnt = 0; + HGDI_RGN new_rgn = NULL; new_cnt = hdc->hwnd->count * 2; if (new_cnt > UINT32_MAX) return FALSE; diff --git a/libfreerdp/gdi/shape.c b/libfreerdp/gdi/shape.c index ef21ff87e..b2a4fff00 100644 --- a/libfreerdp/gdi/shape.c +++ b/libfreerdp/gdi/shape.c @@ -41,13 +41,13 @@ static void Ellipse_Bresenham(HGDI_DC hdc, int x1, int y1, int x2, int y2) { - INT32 e; - INT32 e2; - INT32 dx; - INT32 dy; - INT32 a; - INT32 b; - INT32 c; + INT32 e = 0; + INT32 e2 = 0; + INT32 dx = 0; + INT32 dy = 0; + INT32 a = 0; + INT32 b = 0; + INT32 c = 0; a = (x1 < x2) ? x2 - x1 : x1 - x2; b = (y1 < y2) ? y2 - y1 : y1 - y2; c = b & 1; @@ -130,17 +130,17 @@ BOOL gdi_Ellipse(HGDI_DC hdc, int nLeftRect, int nTopRect, int nRightRect, int n BOOL gdi_FillRect(HGDI_DC hdc, const HGDI_RECT rect, HGDI_BRUSH hbr) { - INT32 x; - INT32 y; - UINT32 color; - UINT32 dstColor; + INT32 x = 0; + INT32 y = 0; + UINT32 color = 0; + UINT32 dstColor = 0; BOOL monochrome = FALSE; - INT32 nXDest; - INT32 nYDest; - INT32 nWidth; - INT32 nHeight; - const BYTE* srcp; - DWORD formatSize; + INT32 nXDest = 0; + INT32 nYDest = 0; + INT32 nWidth = 0; + INT32 nHeight = 0; + const BYTE* srcp = NULL; + DWORD formatSize = 0; gdi_RectToCRgn(rect, &nXDest, &nYDest, &nWidth, &nHeight); if (!hdc || !hbr) @@ -253,9 +253,9 @@ BOOL gdi_PolyPolygon(HGDI_DC hdc, GDI_POINT* lpPoints, int* lpPolyCounts, int nC BOOL gdi_Rectangle(HGDI_DC hdc, INT32 nXDst, INT32 nYDst, INT32 nWidth, INT32 nHeight) { - INT32 x; - INT32 y; - UINT32 color; + INT32 x = 0; + INT32 y = 0; + UINT32 color = 0; if (!gdi_ClipCoords(hdc, &nXDst, &nYDst, &nWidth, &nHeight, NULL, NULL)) return TRUE; diff --git a/libfreerdp/gdi/test/TestGdiBitBlt.c b/libfreerdp/gdi/test/TestGdiBitBlt.c index 8ab5bcc40..78cfef50c 100644 --- a/libfreerdp/gdi/test/TestGdiBitBlt.c +++ b/libfreerdp/gdi/test/TestGdiBitBlt.c @@ -409,7 +409,7 @@ static BOOL test_gdi_BitBlt(UINT32 SrcFormat, UINT32 DstFormat) { BOOL rc = FALSE; BOOL failed = FALSE; - UINT32 x; + UINT32 x = 0; HGDI_DC hdcSrc = NULL; HGDI_DC hdcDst = NULL; const UINT32 RawFormat = PIXEL_FORMAT_RGB8; @@ -458,7 +458,7 @@ static BOOL test_gdi_BitBlt(UINT32 SrcFormat, UINT32 DstFormat) HGDI_BITMAP hBmpSrc = NULL; HGDI_BITMAP hBmpDst = NULL; HGDI_BITMAP hBmpDstOriginal = NULL; - HGDI_BRUSH brush; + HGDI_BRUSH brush = NULL; gdiPalette g; gdiPalette* hPalette = &g; g.format = DstFormat; diff --git a/libfreerdp/gdi/test/TestGdiClip.c b/libfreerdp/gdi/test/TestGdiClip.c index 9f3ca2a46..b133faa80 100644 --- a/libfreerdp/gdi/test/TestGdiClip.c +++ b/libfreerdp/gdi/test/TestGdiClip.c @@ -15,8 +15,8 @@ static int test_gdi_ClipCoords(void) { int rc = -1; - BOOL draw; - HGDI_DC hdc; + BOOL draw = 0; + HGDI_DC hdc = NULL; HGDI_RGN rgn1 = NULL; HGDI_RGN rgn2 = NULL; HGDI_BITMAP bmp = NULL; @@ -165,7 +165,7 @@ fail: static int test_gdi_InvalidateRegion(void) { int rc = -1; - HGDI_DC hdc; + HGDI_DC hdc = NULL; HGDI_RGN rgn1 = NULL; HGDI_RGN rgn2 = NULL; HGDI_RGN invalid = NULL; diff --git a/libfreerdp/gdi/test/TestGdiCreate.c b/libfreerdp/gdi/test/TestGdiCreate.c index 0dd82644d..0f50e3fbb 100644 --- a/libfreerdp/gdi/test/TestGdiCreate.c +++ b/libfreerdp/gdi/test/TestGdiCreate.c @@ -24,7 +24,7 @@ static const UINT32 colorFormatCount = sizeof(colorFormatList) / sizeof(colorFor static int test_gdi_GetDC(void) { int rc = -1; - HGDI_DC hdc; + HGDI_DC hdc = NULL; if (!(hdc = gdi_GetDC())) { @@ -85,9 +85,9 @@ static int test_gdi_CreateBitmap(void) { int rc = -1; UINT32 format = PIXEL_FORMAT_ARGB32; - INT32 width; - INT32 height; - BYTE* data; + INT32 width = 0; + INT32 height = 0; + BYTE* data = NULL; HGDI_BITMAP hBitmap = NULL; width = 32; height = 16; @@ -133,9 +133,9 @@ fail: static int test_gdi_CreateCompatibleBitmap(void) { int rc = -1; - HGDI_DC hdc; - INT32 width; - INT32 height; + HGDI_DC hdc = NULL; + INT32 width = 0; + INT32 height = 0; HGDI_BITMAP hBitmap = NULL; if (!(hdc = gdi_GetDC())) @@ -224,8 +224,8 @@ fail: static int test_gdi_CreatePatternBrush(void) { int rc = -1; - HGDI_BRUSH hBrush; - HGDI_BITMAP hBitmap; + HGDI_BRUSH hBrush = NULL; + HGDI_BITMAP hBitmap = NULL; hBitmap = gdi_CreateBitmap(64, 64, 32, NULL); hBrush = gdi_CreatePatternBrush(hBitmap); @@ -292,7 +292,7 @@ fail: static int test_gdi_CreateRect(void) { int rc = -1; - HGDI_RECT hRect; + HGDI_RECT hRect = NULL; INT32 x1 = 32; INT32 y1 = 64; INT32 x2 = 128; @@ -328,17 +328,17 @@ fail: static BOOL test_gdi_GetPixel(void) { BOOL rc = TRUE; - UINT32 x; + UINT32 x = 0; for (x = 0; x < colorFormatCount; x++) { - UINT32 i; - UINT32 j; - UINT32 bpp; - HGDI_DC hdc; + UINT32 i = 0; + UINT32 j = 0; + UINT32 bpp = 0; + HGDI_DC hdc = NULL; UINT32 width = 128; UINT32 height = 64; - HGDI_BITMAP hBitmap; + HGDI_BITMAP hBitmap = NULL; if (!(hdc = gdi_GetDC())) { @@ -362,7 +362,7 @@ static BOOL test_gdi_GetPixel(void) { for (j = 0; j < width; j++) { - UINT32 pixel; + UINT32 pixel = 0; const UINT32 color = FreeRDPGetColor(hBitmap->format, rand(), rand(), rand(), rand()); FreeRDPWriteColor(&hBitmap->data[i * hBitmap->scanline + j * bpp], hBitmap->format, @@ -390,17 +390,17 @@ static BOOL test_gdi_GetPixel(void) static BOOL test_gdi_SetPixel(void) { BOOL rc = TRUE; - UINT32 x; + UINT32 x = 0; for (x = 0; x < colorFormatCount; x++) { - UINT32 i; - UINT32 j; - UINT32 bpp; - HGDI_DC hdc; + UINT32 i = 0; + UINT32 j = 0; + UINT32 bpp = 0; + HGDI_DC hdc = NULL; UINT32 width = 128; UINT32 height = 64; - HGDI_BITMAP hBitmap; + HGDI_BITMAP hBitmap = NULL; if (!(hdc = gdi_GetDC())) { @@ -417,7 +417,7 @@ static BOOL test_gdi_SetPixel(void) { for (j = 0; j < width; j++) { - UINT32 pixel; + UINT32 pixel = 0; const UINT32 color = FreeRDPGetColor(hBitmap->format, rand(), rand(), rand(), rand()); gdi_SetPixel(hdc, j, i, color); @@ -445,7 +445,7 @@ static BOOL test_gdi_SetPixel(void) static int test_gdi_SetROP2(void) { int rc = -1; - HGDI_DC hdc; + HGDI_DC hdc = NULL; if (!(hdc = gdi_GetDC())) { @@ -467,7 +467,7 @@ fail: static int test_gdi_MoveToEx(void) { int rc = -1; - HGDI_DC hdc; + HGDI_DC hdc = NULL; HGDI_PEN hPen = NULL; HGDI_POINT prevPoint = NULL; const UINT32 format = PIXEL_FORMAT_RGBA32; diff --git a/libfreerdp/gdi/test/TestGdiEllipse.c b/libfreerdp/gdi/test/TestGdiEllipse.c index 62120960c..7548cc9f0 100644 --- a/libfreerdp/gdi/test/TestGdiEllipse.c +++ b/libfreerdp/gdi/test/TestGdiEllipse.c @@ -77,8 +77,8 @@ static const BYTE ellipse_case_3[256] = { int TestGdiEllipse(int argc, char* argv[]) { int rc = -1; - UINT32 i; - UINT32 j; + UINT32 i = 0; + UINT32 j = 0; const UINT32 RawFormat = PIXEL_FORMAT_RGB8; const UINT32 colorFormats[] = { PIXEL_FORMAT_RGB15, PIXEL_FORMAT_ARGB15, PIXEL_FORMAT_RGB16, PIXEL_FORMAT_RGB24, PIXEL_FORMAT_ARGB32, PIXEL_FORMAT_XRGB32, diff --git a/libfreerdp/gdi/test/TestGdiLine.c b/libfreerdp/gdi/test/TestGdiLine.c index 0d3f29c7d..ae2152826 100644 --- a/libfreerdp/gdi/test/TestGdiLine.c +++ b/libfreerdp/gdi/test/TestGdiLine.c @@ -565,8 +565,8 @@ static BOOL test_line(HGDI_DC hdc, const gdiPalette* hPalette, UINT32 mX, UINT32 int TestGdiLine(int argc, char* argv[]) { int rc = -1; - UINT32 x; - UINT32 i; + UINT32 x = 0; + UINT32 i = 0; gdiPalette g; const UINT32 RawFormat = PIXEL_FORMAT_RGB8; const UINT32 colorFormats[] = { PIXEL_FORMAT_RGB15, PIXEL_FORMAT_ARGB15, PIXEL_FORMAT_RGB16, @@ -603,7 +603,7 @@ int TestGdiLine(int argc, char* argv[]) const UINT32 map_size = sizeof(rop_map) / sizeof(rop_map[0]); HGDI_BITMAP hBmp_LineTo[LINTETO_NUMBER] = { NULL }; gdiPalette* hPalette = &g; - UINT32 penColor; + UINT32 penColor = 0; const UINT32 format = colorFormats[i]; g.format = format; diff --git a/libfreerdp/gdi/test/TestGdiRect.c b/libfreerdp/gdi/test/TestGdiRect.c index 46b136172..be9960b88 100644 --- a/libfreerdp/gdi/test/TestGdiRect.c +++ b/libfreerdp/gdi/test/TestGdiRect.c @@ -17,7 +17,7 @@ static int test_gdi_PtInRect(void) { int rc = -1; - HGDI_RECT hRect; + HGDI_RECT hRect = NULL; UINT32 left = 20; UINT32 top = 40; UINT32 right = 60; @@ -69,13 +69,13 @@ static int test_gdi_FillRect(void) HGDI_RECT hRect = NULL; HGDI_BRUSH hBrush = NULL; HGDI_BITMAP hBitmap = NULL; - UINT32 color; - UINT32 pixel; - UINT32 rawPixel; - UINT32 x; - UINT32 y; - UINT32 badPixels; - UINT32 goodPixels; + UINT32 color = 0; + UINT32 pixel = 0; + UINT32 rawPixel = 0; + UINT32 x = 0; + UINT32 y = 0; + UINT32 badPixels = 0; + UINT32 goodPixels = 0; UINT32 width = 200; UINT32 height = 300; UINT32 left = 20; diff --git a/libfreerdp/gdi/test/TestGdiRegion.c b/libfreerdp/gdi/test/TestGdiRegion.c index fc4ca76c8..3f7ed93ec 100644 --- a/libfreerdp/gdi/test/TestGdiRegion.c +++ b/libfreerdp/gdi/test/TestGdiRegion.c @@ -14,14 +14,14 @@ int TestGdiRegion(int argc, char* argv[]) { int rc = -1; - INT32 x; - INT32 y; - INT32 w; - INT32 h; - INT32 l; - INT32 r; - INT32 t; - INT32 b; + INT32 x = 0; + INT32 y = 0; + INT32 w = 0; + INT32 h = 0; + INT32 l = 0; + INT32 r = 0; + INT32 t = 0; + INT32 b = 0; HGDI_RGN rgn1 = NULL; HGDI_RGN rgn2 = NULL; HGDI_RECT rect1 = NULL; diff --git a/libfreerdp/gdi/test/TestGdiRop3.c b/libfreerdp/gdi/test/TestGdiRop3.c index 6e2309b1f..47b9ab6b5 100644 --- a/libfreerdp/gdi/test/TestGdiRop3.c +++ b/libfreerdp/gdi/test/TestGdiRop3.c @@ -96,18 +96,18 @@ static char* gdi_convert_postfix_to_infix(const char* postfix) { - size_t i; - size_t length; - BOOL unary; - wStack* stack; - size_t al; - size_t bl; - size_t cl; - size_t dl; - char* a; - char* b; - char* c; - char* d; + size_t i = 0; + size_t length = 0; + BOOL unary = 0; + wStack* stack = NULL; + size_t al = 0; + size_t bl = 0; + size_t cl = 0; + size_t dl = 0; + char* a = NULL; + char* b = NULL; + char* c = NULL; + char* d = NULL; bl = cl = dl = 0; stack = Stack_New(FALSE); length = strlen(postfix); @@ -190,7 +190,7 @@ static const char* test_ROP3[] = { "DSPDxax", "PSDPxax", "SPna", "DSna", "D int TestGdiRop3(int argc, char* argv[]) { - size_t index; + size_t index = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/libfreerdp/gdi/test/helpers.c b/libfreerdp/gdi/test/helpers.c index 9606041b3..c834ff14c 100644 --- a/libfreerdp/gdi/test/helpers.c +++ b/libfreerdp/gdi/test/helpers.c @@ -24,8 +24,8 @@ HGDI_BITMAP test_convert_to_bitmap(const BYTE* src, UINT32 SrcFormat, UINT32 Src UINT32 yDst, UINT32 nWidth, UINT32 nHeight, const gdiPalette* hPalette) { - HGDI_BITMAP bmp; - BYTE* data; + HGDI_BITMAP bmp = NULL; + BYTE* data = NULL; if (DstStride == 0) DstStride = nWidth * FreeRDPGetBytesPerPixel(DstFormat); @@ -56,8 +56,8 @@ HGDI_BITMAP test_convert_to_bitmap(const BYTE* src, UINT32 SrcFormat, UINT32 Src static void test_dump_data(unsigned char* p, int len, int width, const char* name) { unsigned char* line = p; - int i; - int thisline; + int i = 0; + int thisline = 0; int offset = 0; return; // TODO: Activate this manually if required. Improves test speed printf("\n%s[%d][%d]:\n", name, len / width, width); @@ -93,12 +93,12 @@ void test_dump_bitmap(HGDI_BITMAP hBmp, const char* name) static BOOL CompareBitmaps(HGDI_BITMAP hBmp1, HGDI_BITMAP hBmp2, const gdiPalette* palette) { - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; const BYTE* p1 = hBmp1->data; const BYTE* p2 = hBmp2->data; - UINT32 colorA; - UINT32 colorB; + UINT32 colorA = 0; + UINT32 colorB = 0; UINT32 minw = (hBmp1->width < hBmp2->width) ? hBmp1->width : hBmp2->width; UINT32 minh = (hBmp1->height < hBmp2->height) ? hBmp1->height : hBmp2->height; diff --git a/libfreerdp/gdi/video.c b/libfreerdp/gdi/video.c index fc605eba0..b574fb73c 100644 --- a/libfreerdp/gdi/video.c +++ b/libfreerdp/gdi/video.c @@ -64,8 +64,8 @@ static BOOL gdiVideoShowSurface(VideoClientContext* video, const VideoSurface* s UINT32 destinationWidth, UINT32 destinationHeight) { BOOL rc = FALSE; - rdpGdi* gdi; - rdpUpdate* update; + rdpGdi* gdi = NULL; + rdpUpdate* update = NULL; WINPR_ASSERT(video); WINPR_ASSERT(surface); @@ -150,7 +150,7 @@ void gdi_video_control_uninit(rdpGdi* gdi, VideoClientContext* video) static void gdi_video_timer(void* context, const TimerEventArgs* timer) { rdpContext* ctx = (rdpContext*)context; - rdpGdi* gdi; + rdpGdi* gdi = NULL; WINPR_ASSERT(ctx); WINPR_ASSERT(timer); @@ -177,7 +177,7 @@ void gdi_video_data_uninit(rdpGdi* gdi, VideoClientContext* context) VideoSurface* VideoClient_CreateCommonContext(size_t size, UINT32 x, UINT32 y, UINT32 w, UINT32 h) { - VideoSurface* ret; + VideoSurface* ret = NULL; WINPR_ASSERT(size >= sizeof(VideoSurface)); diff --git a/libfreerdp/locale/keyboard.c b/libfreerdp/locale/keyboard.c index 08c1320fa..3ca340965 100644 --- a/libfreerdp/locale/keyboard.c +++ b/libfreerdp/locale/keyboard.c @@ -290,7 +290,7 @@ static int freerdp_keyboard_init_x11_evdev(DWORD* keyboardLayoutId, DWORD freerdp_keyboard_init(DWORD keyboardLayoutId) { - DWORD keycode; + DWORD keycode = 0; int status = -1; #if defined(__APPLE__) @@ -344,14 +344,14 @@ DWORD freerdp_keyboard_init_ex(DWORD keyboardLayoutId, const char* keyboardRemap { char* copy = _strdup(keyboardRemappingList); char* context = NULL; - char* token; + char* token = NULL; if (!copy) goto fail; token = strtok_s(copy, ",", &context); while (token) { - DWORD key; - DWORD value; + DWORD key = 0; + DWORD value = 0; int rc = sscanf(token, "%" PRIu32 "=%" PRIu32, &key, &value); if (rc != 2) rc = sscanf(token, "%" PRIx32 "=%" PRIx32 "", &key, &value); @@ -412,7 +412,7 @@ DWORD freerdp_keyboard_get_x11_keycode_from_rdp_scancode(DWORD scancode, BOOL ex const char* freerdp_keyboard_scancode_name(DWORD scancode) { - size_t x; + size_t x = 0; for (x = 0; x < ARRAYSIZE(RDP_SCANCODE_MAP); x++) { diff --git a/libfreerdp/locale/keyboard_layout.c b/libfreerdp/locale/keyboard_layout.c index 58f7944d9..e6a456e8d 100644 --- a/libfreerdp/locale/keyboard_layout.c +++ b/libfreerdp/locale/keyboard_layout.c @@ -799,7 +799,7 @@ static const RDP_KEYBOARD_IME RDP_KEYBOARD_IME_TABLE[] = { void freerdp_keyboard_layouts_free(RDP_KEYBOARD_LAYOUT* layouts, size_t count) { - size_t x; + size_t x = 0; if (!layouts) return; @@ -816,8 +816,8 @@ void freerdp_keyboard_layouts_free(RDP_KEYBOARD_LAYOUT* layouts, size_t count) RDP_KEYBOARD_LAYOUT* freerdp_keyboard_get_layouts(DWORD types, size_t* count) { - size_t num; - size_t i; + size_t num = 0; + size_t i = 0; RDP_KEYBOARD_LAYOUT* layouts = NULL; num = 0; @@ -897,7 +897,7 @@ fail: const char* freerdp_keyboard_get_layout_name_from_id(DWORD keyboardLayoutID) { - size_t i; + size_t i = 0; for (i = 0; i < ARRAYSIZE(RDP_KEYBOARD_LAYOUT_TABLE); i++) { @@ -922,7 +922,7 @@ const char* freerdp_keyboard_get_layout_name_from_id(DWORD keyboardLayoutID) DWORD freerdp_keyboard_get_layout_id_from_name(const char* name) { - size_t i; + size_t i = 0; for (i = 0; i < ARRAYSIZE(RDP_KEYBOARD_LAYOUT_TABLE); i++) { @@ -966,7 +966,7 @@ static void copy(const struct LanguageIdentifier* id, RDP_CODEPAGE* cp) static BOOL copyOnMatch(DWORD column, const char* filter, const struct LanguageIdentifier* cur, RDP_CODEPAGE* dst) { - const char* what; + const char* what = NULL; switch (column) { case 0: @@ -1000,7 +1000,7 @@ static BOOL copyOnMatch(DWORD column, const char* filter, const struct LanguageI RDP_CODEPAGE* freerdp_keyboard_get_matching_codepages(DWORD column, const char* filter, size_t* count) { - size_t x; + size_t x = 0; size_t cnt = 0; const size_t c = ARRAYSIZE(language_identifiers); RDP_CODEPAGE* pages = calloc(ARRAYSIZE(language_identifiers), sizeof(RDP_CODEPAGE)); diff --git a/libfreerdp/locale/keyboard_x11.c b/libfreerdp/locale/keyboard_x11.c index 03290c070..7469eb529 100644 --- a/libfreerdp/locale/keyboard_x11.c +++ b/libfreerdp/locale/keyboard_x11.c @@ -31,8 +31,8 @@ static BOOL parse_xkb_rule_names(char* xkb_rule, unsigned long num_bytes, char** layout, char** variant) { - size_t i; - size_t index; + size_t i = 0; + size_t index = 0; /* Sample output for "Canadian Multilingual Standard" * * _XKB_RULES_NAMES_BACKUP(STRING) = "xorg", "pc105", "ca", "multi", "magic" @@ -84,7 +84,7 @@ static DWORD kbd_layout_id_from_x_property(Display* display, Window root, char* { char* layout = NULL; char* variant = NULL; - char* rule; + char* rule = NULL; Atom property = None; Atom type = None; int item_size = 0; diff --git a/libfreerdp/locale/keyboard_xkbfile.c b/libfreerdp/locale/keyboard_xkbfile.c index b627aea9a..a64cac977 100644 --- a/libfreerdp/locale/keyboard_xkbfile.c +++ b/libfreerdp/locale/keyboard_xkbfile.c @@ -314,7 +314,7 @@ static int freerdp_keyboard_load_map_from_xkbfile(void* display, DWORD* x11_keyc static void* freerdp_keyboard_xkb_init(void) { - int status; + int status = 0; Display* display = XOpenDisplay(NULL); @@ -362,7 +362,7 @@ int freerdp_keyboard_init_xkbfile(DWORD* keyboardLayoutId, DWORD* x11_keycode_to /* return substring starting after nth comma, ending at following comma */ static char* comma_substring(char* s, size_t n) { - char* p; + char* p = NULL; if (!s) return ""; diff --git a/libfreerdp/locale/locale.c b/libfreerdp/locale/locale.c index 1d82a1d65..597a6292e 100644 --- a/libfreerdp/locale/locale.c +++ b/libfreerdp/locale/locale.c @@ -685,9 +685,9 @@ static BOOL freerdp_get_system_language_and_country_codes(char* language, size_t } #else { - size_t dot; - DWORD nSize; - size_t underscore; + size_t dot = 0; + DWORD nSize = 0; + size_t underscore = 0; char* env_lang = NULL; LPCSTR lang = "LANG"; /* LANG = _. */ @@ -746,7 +746,7 @@ static BOOL freerdp_get_system_language_and_country_codes(char* language, size_t static const SYSTEM_LOCALE* freerdp_detect_system_locale(void) { - size_t i; + size_t i = 0; char language[LOCALE_LANGUAGE_LEN] = { 0 }; char country[LOCALE_COUNTRY_LEN] = { 0 }; const SYSTEM_LOCALE* locale = NULL; @@ -770,7 +770,7 @@ static const SYSTEM_LOCALE* freerdp_detect_system_locale(void) DWORD freerdp_get_system_locale_id(void) { - const SYSTEM_LOCALE* locale; + const SYSTEM_LOCALE* locale = NULL; locale = freerdp_detect_system_locale(); if (locale != NULL) @@ -781,7 +781,7 @@ DWORD freerdp_get_system_locale_id(void) const char* freerdp_get_system_locale_name_from_id(DWORD localeId) { - size_t index; + size_t index = 0; for (index = 0; index < ARRAYSIZE(LOCALE_NAME_TABLE); index++) { diff --git a/libfreerdp/primitives/prim_YCoCg.c b/libfreerdp/primitives/prim_YCoCg.c index cb6b7b43c..27f468bd6 100644 --- a/libfreerdp/primitives/prim_YCoCg.c +++ b/libfreerdp/primitives/prim_YCoCg.c @@ -37,8 +37,8 @@ static pstatus_t general_YCoCgToRGB_8u_AC4R(const BYTE* pSrc, INT32 srcStep, BYT UINT32 DstFormat, INT32 dstStep, UINT32 width, UINT32 height, UINT8 shift, BOOL withAlpha) { - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; const DWORD formatSize = FreeRDPGetBytesPerPixel(DstFormat); fkt_writePixel writePixel = getPixelWriteFunction(DstFormat, TRUE); diff --git a/libfreerdp/primitives/prim_YCoCg_opt.c b/libfreerdp/primitives/prim_YCoCg_opt.c index 0a6cae419..fa4f0f0d2 100644 --- a/libfreerdp/primitives/prim_YCoCg_opt.c +++ b/libfreerdp/primitives/prim_YCoCg_opt.c @@ -46,7 +46,7 @@ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R_invert(const BYTE* WINPR_RESTRICT pSr BYTE* dptr = (BYTE*)pDst; int sRowBump = srcStep - width * sizeof(UINT32); int dRowBump = dstStep - width * sizeof(UINT32); - UINT32 h; + UINT32 h = 0; /* Shift left by "shift" and divide by two is the same as shift * left by "shift-1". */ @@ -72,12 +72,12 @@ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R_invert(const BYTE* WINPR_RESTRICT pSr for (h = 0; h < height; h++) { UINT32 w = width; - BOOL onStride; + BOOL onStride = 0; /* Get to a 16-byte destination boundary. */ if ((ULONG_PTR)dptr & 0x0f) { - pstatus_t status; + pstatus_t status = 0; UINT32 startup = (16 - ((ULONG_PTR)dptr & 0x0f)) / 4; if (startup > width) @@ -205,7 +205,7 @@ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R_invert(const BYTE* WINPR_RESTRICT pSr /* Handle any remainder pixels. */ if (w > 0) { - pstatus_t status; + pstatus_t status = 0; status = generic->YCoCgToRGB_8u_AC4R(sptr, srcStep, dptr, DstFormat, dstStep, w, 1, shift, withAlpha); @@ -233,7 +233,7 @@ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R_no_invert(const BYTE* WINPR_RESTRICT BYTE* dptr = (BYTE*)pDst; int sRowBump = srcStep - width * sizeof(UINT32); int dRowBump = dstStep - width * sizeof(UINT32); - UINT32 h; + UINT32 h = 0; /* Shift left by "shift" and divide by two is the same as shift * left by "shift-1". */ @@ -259,12 +259,12 @@ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R_no_invert(const BYTE* WINPR_RESTRICT for (h = 0; h < height; h++) { int w = width; - BOOL onStride; + BOOL onStride = 0; /* Get to a 16-byte destination boundary. */ if ((ULONG_PTR)dptr & 0x0f) { - pstatus_t status; + pstatus_t status = 0; UINT32 startup = (16 - ((ULONG_PTR)dptr & 0x0f)) / 4; if (startup > width) @@ -396,7 +396,7 @@ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R_no_invert(const BYTE* WINPR_RESTRICT /* Handle any remainder pixels. */ if (w > 0) { - pstatus_t status; + pstatus_t status = 0; status = generic->YCoCgToRGB_8u_AC4R(sptr, srcStep, dptr, DstFormat, dstStep, w, 1, shift, withAlpha); diff --git a/libfreerdp/primitives/prim_YUV.c b/libfreerdp/primitives/prim_YUV.c index 3ca610075..ad4a0abbe 100644 --- a/libfreerdp/primitives/prim_YUV.c +++ b/libfreerdp/primitives/prim_YUV.c @@ -99,8 +99,8 @@ static pstatus_t general_ChromaFilter(BYTE* WINPR_RESTRICT pDst[3], const UINT32 const UINT32 nHeight = roi->bottom - roi->top; const UINT32 halfHeight = (nHeight + 1) / 2; const UINT32 halfWidth = (nWidth + 1) / 2; - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; /* Filter */ for (y = roi->top; y < halfHeight + roi->top; y++) @@ -123,8 +123,8 @@ static pstatus_t general_ChromaFilter(BYTE* WINPR_RESTRICT pDst[3], const UINT32 const BYTE inV = pV[val2x]; const INT32 up = inU * 4; const INT32 vp = inV * 4; - INT32 u2020; - INT32 v2020; + INT32 u2020 = 0; + INT32 v2020 = 0; if (val2x1 > nWidth) continue; @@ -148,8 +148,8 @@ static pstatus_t general_ChromaV1ToYUV444(const BYTE* const WINPR_RESTRICT pSrcR const UINT32 mod = 16; UINT32 uY = 0; UINT32 vY = 0; - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; const UINT32 nWidth = roi->right - roi->left; const UINT32 nHeight = roi->bottom - roi->top; const UINT32 halfWidth = (nWidth) / 2; @@ -172,7 +172,7 @@ static pstatus_t general_ChromaV1ToYUV444(const BYTE* const WINPR_RESTRICT pSrcR for (y = 0; y < padHeigth; y++) { const BYTE* Ya = pSrc[0] + srcStep[0] * y; - BYTE* pX; + BYTE* pX = NULL; if ((y) % mod < (mod + 1) / 2) { @@ -223,8 +223,8 @@ static pstatus_t general_ChromaV2ToYUV444(const BYTE* const WINPR_RESTRICT pSrc[ const UINT32 dstStep[3], const RECTANGLE_16* WINPR_RESTRICT roi) { - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; const UINT32 nWidth = roi->right - roi->left; const UINT32 nHeight = roi->bottom - roi->top; const UINT32 halfWidth = (nWidth + 1) / 2; @@ -308,12 +308,12 @@ general_YUV444SplitToYUV420(const BYTE* const WINPR_RESTRICT pSrc[3], const UINT BYTE* WINPR_RESTRICT pAuxDst[3], const UINT32 dstAuxStep[3], const prim_size_t* WINPR_RESTRICT roi) { - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; UINT32 uY = 0; UINT32 vY = 0; - UINT32 halfWidth; - UINT32 halfHeight; + UINT32 halfWidth = 0; + UINT32 halfHeight = 0; /* The auxilary frame is aligned to multiples of 16x16. * We need the padded height for B4 and B5 conversion. */ const UINT32 padHeigth = roi->height + 16 - roi->height % 16; @@ -494,23 +494,23 @@ static pstatus_t general_YUV420ToRGB_8u_P3AC4R(const BYTE* const WINPR_RESTRICT UINT32 dstStep, UINT32 DstFormat, const prim_size_t* WINPR_RESTRICT roi) { - UINT32 x; - UINT32 y; - UINT32 dstPad; + UINT32 x = 0; + UINT32 y = 0; + UINT32 dstPad = 0; UINT32 srcPad[3]; - BYTE Y; - BYTE U; - BYTE V; - UINT32 halfWidth; - UINT32 halfHeight; - const BYTE* pY; - const BYTE* pU; - const BYTE* pV; + BYTE Y = 0; + BYTE U = 0; + BYTE V = 0; + UINT32 halfWidth = 0; + UINT32 halfHeight = 0; + const BYTE* pY = NULL; + const BYTE* pU = NULL; + const BYTE* pV = NULL; BYTE* pRGB = pDst; - UINT32 nWidth; - UINT32 nHeight; - UINT32 lastRow; - UINT32 lastCol; + UINT32 nWidth = 0; + UINT32 nHeight = 0; + UINT32 lastRow = 0; + UINT32 lastCol = 0; const DWORD formatSize = FreeRDPGetBytesPerPixel(DstFormat); fkt_writePixel writePixel = getPixelWriteFunction(DstFormat, FALSE); pY = pSrc[0]; @@ -534,9 +534,9 @@ static pstatus_t general_YUV420ToRGB_8u_P3AC4R(const BYTE* const WINPR_RESTRICT for (x = 0; x < halfWidth;) { - BYTE r; - BYTE g; - BYTE b; + BYTE r = 0; + BYTE g = 0; + BYTE b = 0; if (++x == halfWidth) lastCol <<= 1; @@ -577,9 +577,9 @@ static pstatus_t general_YUV420ToRGB_8u_P3AC4R(const BYTE* const WINPR_RESTRICT for (x = 0; x < halfWidth;) { - BYTE r; - BYTE g; - BYTE b; + BYTE r = 0; + BYTE g = 0; + BYTE b = 0; if (++x == halfWidth) lastCol <<= 1; @@ -645,10 +645,10 @@ static pstatus_t general_RGBToYUV444_8u_P3AC4R(const BYTE* WINPR_RESTRICT pSrc, const prim_size_t* WINPR_RESTRICT roi) { const UINT32 bpp = FreeRDPGetBytesPerPixel(SrcFormat); - UINT32 x; - UINT32 y; - UINT32 nWidth; - UINT32 nHeight; + UINT32 x = 0; + UINT32 y = 0; + UINT32 nWidth = 0; + UINT32 nHeight = 0; nWidth = roi->width; nHeight = roi->height; @@ -661,9 +661,9 @@ static pstatus_t general_RGBToYUV444_8u_P3AC4R(const BYTE* WINPR_RESTRICT pSrc, for (x = 0; x < nWidth; x++) { - BYTE B; - BYTE G; - BYTE R; + BYTE B = 0; + BYTE G = 0; + BYTE R = 0; const UINT32 color = FreeRDPReadColor(&pRGB[x * bpp], SrcFormat); FreeRDPSplitColor(color, SrcFormat, &R, &G, &B, NULL, NULL); pY[x] = RGB2Y(R, G, B); @@ -680,9 +680,9 @@ static INLINE pstatus_t general_RGBToYUV420_BGRX(const BYTE* WINPR_RESTRICT pSrc const UINT32 dstStep[3], const prim_size_t* WINPR_RESTRICT roi) { - UINT32 x; - UINT32 y; - UINT32 i; + UINT32 x = 0; + UINT32 y = 0; + UINT32 i = 0; size_t x1 = 0; size_t x2 = 4; size_t x3 = srcStep; @@ -703,12 +703,12 @@ static INLINE pstatus_t general_RGBToYUV420_BGRX(const BYTE* WINPR_RESTRICT pSrc for (x = 0; x < roi->width; x += 2) { - BYTE R; - BYTE G; - BYTE B; - INT32 Ra; - INT32 Ga; - INT32 Ba; + BYTE R = 0; + BYTE G = 0; + BYTE B = 0; + INT32 Ra = 0; + INT32 Ga = 0; + INT32 Ba = 0; /* row 1, pixel 1 */ Ba = B = *(src + x1 + 0); Ga = G = *(src + x1 + 1); @@ -760,9 +760,9 @@ static INLINE pstatus_t general_RGBToYUV420_RGBX(const BYTE* WINPR_RESTRICT pSrc const UINT32 dstStep[3], const prim_size_t* WINPR_RESTRICT roi) { - UINT32 x; - UINT32 y; - UINT32 i; + UINT32 x = 0; + UINT32 y = 0; + UINT32 i = 0; size_t x1 = 0; size_t x2 = 4; size_t x3 = srcStep; @@ -783,12 +783,12 @@ static INLINE pstatus_t general_RGBToYUV420_RGBX(const BYTE* WINPR_RESTRICT pSrc for (x = 0; x < roi->width; x += 2) { - BYTE R; - BYTE G; - BYTE B; - INT32 Ra; - INT32 Ga; - INT32 Ba; + BYTE R = 0; + BYTE G = 0; + BYTE B = 0; + INT32 Ra = 0; + INT32 Ga = 0; + INT32 Ba = 0; /* row 1, pixel 1 */ Ra = R = *(src + x1 + 0); Ga = G = *(src + x1 + 1); @@ -841,9 +841,9 @@ static INLINE pstatus_t general_RGBToYUV420_ANY(const BYTE* WINPR_RESTRICT pSrc, const prim_size_t* WINPR_RESTRICT roi) { const UINT32 bpp = FreeRDPGetBytesPerPixel(srcFormat); - UINT32 x; - UINT32 y; - UINT32 i; + UINT32 x = 0; + UINT32 y = 0; + UINT32 i = 0; size_t x1 = 0; size_t x2 = bpp; size_t x3 = srcStep; @@ -864,13 +864,13 @@ static INLINE pstatus_t general_RGBToYUV420_ANY(const BYTE* WINPR_RESTRICT pSrc, for (x = 0; x < roi->width; x += 2) { - BYTE R; - BYTE G; - BYTE B; - INT32 Ra; - INT32 Ga; - INT32 Ba; - UINT32 color; + BYTE R = 0; + BYTE G = 0; + BYTE B = 0; + INT32 Ra = 0; + INT32 Ga = 0; + INT32 Ba = 0; + UINT32 color = 0; /* row 1, pixel 1 */ color = FreeRDPReadColor(src + x1, srcFormat); FreeRDPSplitColor(color, srcFormat, &R, &G, &B, NULL, NULL); @@ -954,18 +954,18 @@ static INLINE void general_RGBToAVC444YUV_BGRX_DOUBLE_ROW( for (UINT32 x = 0; x < width; x += 2) { const BOOL lastX = (x + 1) >= width; - BYTE Y1e; - BYTE Y2e; - BYTE U1e; - BYTE V1e; - BYTE U2e; - BYTE V2e; - BYTE Y1o; - BYTE Y2o; - BYTE U1o; - BYTE V1o; - BYTE U2o; - BYTE V2o; + BYTE Y1e = 0; + BYTE Y2e = 0; + BYTE U1e = 0; + BYTE V1e = 0; + BYTE U2e = 0; + BYTE V2e = 0; + BYTE Y1o = 0; + BYTE Y2o = 0; + BYTE U1o = 0; + BYTE V1o = 0; + BYTE U2o = 0; + BYTE V2o = 0; /* Read 4 pixels, 2 from even, 2 from odd lines */ { const BYTE b = *srcEven++; @@ -1062,7 +1062,7 @@ static INLINE pstatus_t general_RGBToAVC444YUV_BGRX(const BYTE* WINPR_RESTRICT p * Note: * Read information in function general_RGBToAVC444YUV_ANY below ! */ - UINT32 y; + UINT32 y = 0; const BYTE* pMaxSrc = pSrc + (roi->height - 1) * srcStep; for (y = 0; y < roi->height; y += 2) @@ -1096,18 +1096,18 @@ static INLINE void general_RGBToAVC444YUV_RGBX_DOUBLE_ROW( for (UINT32 x = 0; x < width; x += 2) { const BOOL lastX = (x + 1) >= width; - BYTE Y1e; - BYTE Y2e; - BYTE U1e; - BYTE V1e; - BYTE U2e; - BYTE V2e; - BYTE Y1o; - BYTE Y2o; - BYTE U1o; - BYTE V1o; - BYTE U2o; - BYTE V2o; + BYTE Y1e = 0; + BYTE Y2e = 0; + BYTE U1e = 0; + BYTE V1e = 0; + BYTE U2e = 0; + BYTE V2e = 0; + BYTE Y1o = 0; + BYTE Y2o = 0; + BYTE U1o = 0; + BYTE V1o = 0; + BYTE U2o = 0; + BYTE V2o = 0; /* Read 4 pixels, 2 from even, 2 from odd lines */ { const BYTE r = *srcEven++; @@ -1238,23 +1238,23 @@ static INLINE void general_RGBToAVC444YUV_ANY_DOUBLE_ROW( for (UINT32 x = 0; x < width; x += 2) { const BOOL lastX = (x + 1) >= width; - BYTE Y1e; - BYTE Y2e; - BYTE U1e; - BYTE V1e; - BYTE U2e; - BYTE V2e; - BYTE Y1o; - BYTE Y2o; - BYTE U1o; - BYTE V1o; - BYTE U2o; - BYTE V2o; + BYTE Y1e = 0; + BYTE Y2e = 0; + BYTE U1e = 0; + BYTE V1e = 0; + BYTE U2e = 0; + BYTE V2e = 0; + BYTE Y1o = 0; + BYTE Y2o = 0; + BYTE U1o = 0; + BYTE V1o = 0; + BYTE U2o = 0; + BYTE V2o = 0; /* Read 4 pixels, 2 from even, 2 from odd lines */ { - BYTE r; - BYTE g; - BYTE b; + BYTE r = 0; + BYTE g = 0; + BYTE b = 0; const UINT32 color = FreeRDPReadColor(srcEven, srcFormat); srcEven += bpp; FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); @@ -1265,9 +1265,9 @@ static INLINE void general_RGBToAVC444YUV_ANY_DOUBLE_ROW( if (!lastX) { - BYTE r; - BYTE g; - BYTE b; + BYTE r = 0; + BYTE g = 0; + BYTE b = 0; const UINT32 color = FreeRDPReadColor(srcEven, srcFormat); srcEven += bpp; FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); @@ -1278,9 +1278,9 @@ static INLINE void general_RGBToAVC444YUV_ANY_DOUBLE_ROW( if (b1Odd) { - BYTE r; - BYTE g; - BYTE b; + BYTE r = 0; + BYTE g = 0; + BYTE b = 0; const UINT32 color = FreeRDPReadColor(srcOdd, srcFormat); srcOdd += bpp; FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); @@ -1291,9 +1291,9 @@ static INLINE void general_RGBToAVC444YUV_ANY_DOUBLE_ROW( if (b1Odd && !lastX) { - BYTE r; - BYTE g; - BYTE b; + BYTE r = 0; + BYTE g = 0; + BYTE b = 0; const UINT32 color = FreeRDPReadColor(srcOdd, srcFormat); srcOdd += bpp; FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); @@ -1484,22 +1484,22 @@ static INLINE void general_RGBToAVC444YUVv2_ANY_DOUBLE_ROW( for (UINT32 x = 0; x < width; x += 2) { - BYTE Ya; - BYTE Ua; - BYTE Va; - BYTE Yb; - BYTE Ub; - BYTE Vb; - BYTE Yc; - BYTE Uc; - BYTE Vc; - BYTE Yd; - BYTE Ud; - BYTE Vd; + BYTE Ya = 0; + BYTE Ua = 0; + BYTE Va = 0; + BYTE Yb = 0; + BYTE Ub = 0; + BYTE Vb = 0; + BYTE Yc = 0; + BYTE Uc = 0; + BYTE Vc = 0; + BYTE Yd = 0; + BYTE Ud = 0; + BYTE Vd = 0; { - BYTE b; - BYTE g; - BYTE r; + BYTE b = 0; + BYTE g = 0; + BYTE r = 0; const UINT32 color = FreeRDPReadColor(srcEven, srcFormat); srcEven += bpp; FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); @@ -1510,9 +1510,9 @@ static INLINE void general_RGBToAVC444YUVv2_ANY_DOUBLE_ROW( if (x < width - 1) { - BYTE b; - BYTE g; - BYTE r; + BYTE b = 0; + BYTE g = 0; + BYTE r = 0; const UINT32 color = FreeRDPReadColor(srcEven, srcFormat); srcEven += bpp; FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); @@ -1529,9 +1529,9 @@ static INLINE void general_RGBToAVC444YUVv2_ANY_DOUBLE_ROW( if (srcOdd) { - BYTE b; - BYTE g; - BYTE r; + BYTE b = 0; + BYTE g = 0; + BYTE r = 0; const UINT32 color = FreeRDPReadColor(srcOdd, srcFormat); srcOdd += bpp; FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); @@ -1548,9 +1548,9 @@ static INLINE void general_RGBToAVC444YUVv2_ANY_DOUBLE_ROW( if (srcOdd && (x < width - 1)) { - BYTE b; - BYTE g; - BYTE r; + BYTE b = 0; + BYTE g = 0; + BYTE r = 0; const UINT32 color = FreeRDPReadColor(srcOdd, srcFormat); srcOdd += bpp; FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); @@ -1707,18 +1707,18 @@ static INLINE void general_RGBToAVC444YUVv2_BGRX_DOUBLE_ROW( { for (UINT32 x = 0; x < width; x += 2) { - BYTE Ya; - BYTE Ua; - BYTE Va; - BYTE Yb; - BYTE Ub; - BYTE Vb; - BYTE Yc; - BYTE Uc; - BYTE Vc; - BYTE Yd; - BYTE Ud; - BYTE Vd; + BYTE Ya = 0; + BYTE Ua = 0; + BYTE Va = 0; + BYTE Yb = 0; + BYTE Ub = 0; + BYTE Vb = 0; + BYTE Yc = 0; + BYTE Uc = 0; + BYTE Vc = 0; + BYTE Yd = 0; + BYTE Ud = 0; + BYTE Vd = 0; { const BYTE b = *srcEven++; const BYTE g = *srcEven++; diff --git a/libfreerdp/primitives/prim_YUV_opencl.c b/libfreerdp/primitives/prim_YUV_opencl.c index 118b1a68d..5d7cd784c 100644 --- a/libfreerdp/primitives/prim_YUV_opencl.c +++ b/libfreerdp/primitives/prim_YUV_opencl.c @@ -51,12 +51,11 @@ static pstatus_t opencl_YUVToRGB(const char* kernelName, const BYTE* const pSrc[ const UINT32 srcStep[3], BYTE* pDst, UINT32 dstStep, const prim_size_t* roi) { - cl_int ret; - cl_uint i; + cl_int ret = 0; cl_mem objs[3] = { NULL, NULL, NULL }; - cl_mem destObj; - cl_kernel kernel; - size_t indexes[2]; + cl_mem destObj = NULL; + cl_kernel kernel = NULL; + size_t indexes[2] = { 0 }; const char* sourceNames[] = { "Y", "U", "V" }; primitives_opencl_context* cl = primitives_get_opencl_context(); @@ -67,7 +66,7 @@ static pstatus_t opencl_YUVToRGB(const char* kernelName, const BYTE* const pSrc[ return -1; } - for (i = 0; i < 3; i++) + for (cl_uint i = 0; i < 3; i++) { objs[i] = clCreateBuffer(cl->context, CL_MEM_READ_ONLY | CL_MEM_USE_HOST_PTR, srcStep[i] * roi->height, (char*)pSrc[i], &ret); @@ -86,7 +85,7 @@ static pstatus_t opencl_YUVToRGB(const char* kernelName, const BYTE* const pSrc[ } /* push source + stride arguments*/ - for (i = 0; i < 3; i++) + for (cl_uint i = 0; i < 3; i++) { ret = clSetKernelArg(kernel, i * 2, sizeof(cl_mem), &objs[i]); if (ret != CL_SUCCESS) @@ -137,7 +136,7 @@ static pstatus_t opencl_YUVToRGB(const char* kernelName, const BYTE* const pSrc[ /* cleanup things */ clReleaseMemObject(destObj); - for (i = 0; i < 3; i++) + for (cl_uint i = 0; i < 3; i++) if (objs[i]) clReleaseMemObject(objs[i]); clReleaseKernel(kernel); @@ -147,7 +146,7 @@ static pstatus_t opencl_YUVToRGB(const char* kernelName, const BYTE* const pSrc[ error_set_args: clReleaseMemObject(destObj); error_objs: - for (i = 0; i < 3; i++) + for (cl_uint i = 0; i < 3; i++) { if (objs[i]) clReleaseMemObject(objs[i]); @@ -183,14 +182,13 @@ static const char* openclProgram = static BOOL primitives_init_opencl_context(primitives_opencl_context* cl) { cl_platform_id* platform_ids = NULL; - cl_uint ndevices; - cl_uint nplatforms; - cl_uint i; - cl_kernel kernel; - cl_int ret; + cl_uint ndevices = 0; + cl_uint nplatforms = 0; + cl_kernel kernel = NULL; + cl_int ret = 0; BOOL gotGPU = FALSE; - size_t programLen; + size_t programLen = 0; ret = clGetPlatformIDs(0, NULL, &nplatforms); if (ret != CL_SUCCESS || nplatforms < 1) @@ -207,10 +205,10 @@ static BOOL primitives_init_opencl_context(primitives_opencl_context* cl) return FALSE; } - for (i = 0; (i < nplatforms) && !gotGPU; i++) + for (cl_uint i = 0; (i < nplatforms) && !gotGPU; i++) { - cl_device_id device_id; - cl_context context; + cl_device_id device_id = NULL; + cl_context context = NULL; char platformName[1000]; char deviceName[1000]; @@ -277,7 +275,7 @@ static BOOL primitives_init_opencl_context(primitives_opencl_context* cl) ret = clBuildProgram(cl->program, 1, &cl->deviceId, NULL, NULL, NULL); if (ret != CL_SUCCESS) { - size_t length; + size_t length = 0; char buffer[2048]; ret = clGetProgramBuildInfo(cl->program, cl->deviceId, CL_PROGRAM_BUILD_LOG, sizeof(buffer), buffer, &length); @@ -318,7 +316,7 @@ static pstatus_t opencl_YUV420ToRGB_8u_P3AC4R(const BYTE* const pSrc[3], const U BYTE* pDst, UINT32 dstStep, UINT32 DstFormat, const prim_size_t* roi) { - const char* kernel_name; + const char* kernel_name = NULL; switch (DstFormat) { @@ -346,7 +344,7 @@ static pstatus_t opencl_YUV444ToRGB_8u_P3AC4R(const BYTE* const pSrc[3], const U BYTE* pDst, UINT32 dstStep, UINT32 DstFormat, const prim_size_t* roi) { - const char* kernel_name; + const char* kernel_name = NULL; switch (DstFormat) { diff --git a/libfreerdp/primitives/prim_YUV_ssse3.c b/libfreerdp/primitives/prim_YUV_ssse3.c index fb0b0e7f4..c0108f3aa 100644 --- a/libfreerdp/primitives/prim_YUV_ssse3.c +++ b/libfreerdp/primitives/prim_YUV_ssse3.c @@ -161,11 +161,11 @@ static pstatus_t ssse3_YUV420ToRGB_BGRX(const BYTE* const WINPR_RESTRICT pSrc[], const UINT32 nHeight = roi->height; const UINT32 pad = roi->width % 16; const __m128i duplicate = _mm_set_epi8(7, 7, 6, 6, 5, 5, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0); - UINT32 y; + UINT32 y = 0; for (y = 0; y < nHeight; y++) { - UINT32 x; + UINT32 x = 0; __m128i* dst = (__m128i*)(pDst + dstStep * y); const BYTE* YData = pSrc[0] + y * srcStep[0]; const BYTE* UData = pSrc[1] + (y / 2) * srcStep[1]; @@ -232,11 +232,11 @@ static pstatus_t ssse3_YUV444ToRGB_8u_P3AC4R_BGRX(const BYTE* const WINPR_RESTRI const UINT32 nWidth = roi->width; const UINT32 nHeight = roi->height; const UINT32 pad = roi->width % 16; - UINT32 y; + UINT32 y = 0; for (y = 0; y < nHeight; y++) { - UINT32 x; + UINT32 x = 0; __m128i* dst = (__m128i*)(pDst + dstStep * y); const BYTE* YData = pSrc[0] + y * srcStep[0]; const BYTE* UData = pSrc[1] + y * srcStep[1]; @@ -348,7 +348,7 @@ PRIM_ALIGN_128 static const BYTE rgbx_v_factors[] = { static INLINE void ssse3_RGBToYUV420_BGRX_Y(const BYTE* WINPR_RESTRICT src, BYTE* dst, UINT32 width) { - UINT32 x; + UINT32 x = 0; __m128i x0; __m128i x1; __m128i x2; @@ -389,7 +389,7 @@ static INLINE void ssse3_RGBToYUV420_BGRX_UV(const BYTE* WINPR_RESTRICT src1, BYTE* WINPR_RESTRICT dst1, BYTE* WINPR_RESTRICT dst2, UINT32 width) { - UINT32 x; + UINT32 x = 0; const __m128i u_factors = BGRX_U_FACTORS; const __m128i v_factors = BGRX_V_FACTORS; const __m128i vector128 = CONST128_FACTORS; @@ -458,7 +458,7 @@ static pstatus_t ssse3_RGBToYUV420_BGRX(const BYTE* WINPR_RESTRICT pSrc, UINT32 const UINT32 dstStep[], const prim_size_t* WINPR_RESTRICT roi) { - UINT32 y; + UINT32 y = 0; const BYTE* argb = pSrc; BYTE* ydst = pDst[0]; BYTE* udst = pDst[1]; @@ -522,7 +522,7 @@ static INLINE void ssse3_RGBToAVC444YUV_BGRX_DOUBLE_ROW( BYTE* WINPR_RESTRICT b3, BYTE* WINPR_RESTRICT b4, BYTE* WINPR_RESTRICT b5, BYTE* WINPR_RESTRICT b6, BYTE* WINPR_RESTRICT b7, UINT32 width) { - UINT32 x; + UINT32 x = 0; const __m128i* argbEven = (const __m128i*)srcEven; const __m128i* argbOdd = (const __m128i*)srcOdd; const __m128i y_factors = BGRX_Y_FACTORS; @@ -804,7 +804,7 @@ static INLINE void ssse3_RGBToAVC444YUVv2_BGRX_DOUBLE_ROW( BYTE* WINPR_RESTRICT uChromaDst1, BYTE* WINPR_RESTRICT uChromaDst2, BYTE* WINPR_RESTRICT vChromaDst1, BYTE* WINPR_RESTRICT vChromaDst2, UINT32 width) { - UINT32 x; + UINT32 x = 0; const __m128i vector128 = CONST128_FACTORS; const __m128i* argbEven = (const __m128i*)srcEven; const __m128i* argbOdd = (const __m128i*)srcOdd; @@ -1102,8 +1102,8 @@ static pstatus_t ssse3_LumaToYUV444(const BYTE* const WINPR_RESTRICT pSrcRaw[], const UINT32 srcStep[], BYTE* WINPR_RESTRICT pDstRaw[], const UINT32 dstStep[], const RECTANGLE_16* WINPR_RESTRICT roi) { - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; const UINT32 nWidth = roi->right - roi->left; const UINT32 nHeight = roi->bottom - roi->top; const UINT32 halfWidth = (nWidth + 1) / 2; @@ -1217,8 +1217,8 @@ static pstatus_t ssse3_ChromaFilter(BYTE* WINPR_RESTRICT pDst[], const UINT32 ds const UINT32 halfHeight = (nHeight + 1) / 2; const UINT32 halfWidth = (nWidth + 1) / 2; const UINT32 halfPad = halfWidth % 16; - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; /* Filter */ for (y = roi->top; y < halfHeight + roi->top; y++) @@ -1247,8 +1247,8 @@ static pstatus_t ssse3_ChromaFilter(BYTE* WINPR_RESTRICT pDst[], const UINT32 ds const BYTE inV = pV[val2x]; const INT32 up = inU * 4; const INT32 vp = inV * 4; - INT32 u2020; - INT32 v2020; + INT32 u2020 = 0; + INT32 v2020 = 0; if (val2x1 > nWidth) continue; @@ -1271,8 +1271,8 @@ static pstatus_t ssse3_ChromaV1ToYUV444(const BYTE* const WINPR_RESTRICT pSrcRaw const UINT32 mod = 16; UINT32 uY = 0; UINT32 vY = 0; - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; const UINT32 nWidth = roi->right - roi->left; const UINT32 nHeight = roi->bottom - roi->top; const UINT32 halfWidth = (nWidth + 1) / 2; @@ -1299,7 +1299,7 @@ static pstatus_t ssse3_ChromaV1ToYUV444(const BYTE* const WINPR_RESTRICT pSrcRaw for (y = 0; y < padHeigth; y++) { const BYTE* Ya = pSrc[0] + srcStep[0] * y; - BYTE* pX; + BYTE* pX = NULL; if ((y) % mod < (mod + 1) / 2) { @@ -1368,8 +1368,8 @@ static pstatus_t ssse3_ChromaV2ToYUV444(const BYTE* const WINPR_RESTRICT pSrc[3] const UINT32 dstStep[3], const RECTANGLE_16* WINPR_RESTRICT roi) { - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; const UINT32 nWidth = roi->right - roi->left; const UINT32 nHeight = roi->bottom - roi->top; const UINT32 halfWidth = (nWidth + 1) / 2; diff --git a/libfreerdp/primitives/prim_alphaComp.c b/libfreerdp/primitives/prim_alphaComp.c index 92536ecee..5c94770bf 100644 --- a/libfreerdp/primitives/prim_alphaComp.c +++ b/libfreerdp/primitives/prim_alphaComp.c @@ -37,14 +37,14 @@ static pstatus_t general_alphaComp_argb(const BYTE* pSrc1, UINT32 src1Step, cons UINT32 src2Step, BYTE* pDst, UINT32 dstStep, UINT32 width, UINT32 height) { - UINT32 y; + UINT32 y = 0; for (y = 0; y < height; y++) { const UINT32* sptr1 = (const UINT32*)(pSrc1 + y * src1Step); const UINT32* sptr2 = (const UINT32*)(pSrc2 + y * src2Step); UINT32* dptr = (UINT32*)(pDst + y * dstStep); - UINT32 x; + UINT32 x = 0; for (x = 0; x < width; x++) { @@ -70,8 +70,8 @@ static pstatus_t general_alphaComp_argb(const BYTE* pSrc1, UINT32 src1Step, cons * I'm not sure who first designed the double-ops trick * (Red Blue and Alpha Green). */ - UINT32 rb; - UINT32 ag; + UINT32 rb = 0; + UINT32 ag = 0; UINT32 s2rb = src2 & 0x00FF00FFU; UINT32 s2ag = (src2 >> 8) & 0x00FF00FFU; UINT32 s1rb = src1 & 0x00FF00FFU; diff --git a/libfreerdp/primitives/prim_alphaComp_opt.c b/libfreerdp/primitives/prim_alphaComp_opt.c index a6e0fc919..73f645477 100644 --- a/libfreerdp/primitives/prim_alphaComp_opt.c +++ b/libfreerdp/primitives/prim_alphaComp_opt.c @@ -50,12 +50,12 @@ static pstatus_t sse2_alphaComp_argb(const BYTE* WINPR_RESTRICT pSrc1, UINT32 sr { const UINT32* sptr1 = (const UINT32*)pSrc1; const UINT32* sptr2 = (const UINT32*)pSrc2; - UINT32* dptr; - int linebytes; - int src1Jump; - int src2Jump; - int dstJump; - UINT32 y; + UINT32* dptr = NULL; + int linebytes = 0; + int src1Jump = 0; + int src2Jump = 0; + int dstJump = 0; + UINT32 y = 0; __m128i xmm0; __m128i xmm1; @@ -79,7 +79,7 @@ static pstatus_t sse2_alphaComp_argb(const BYTE* WINPR_RESTRICT pSrc1, UINT32 sr for (y = 0; y < height; ++y) { int pixels = width; - int count; + int count = 0; /* Get to the 16-byte boundary now. */ int leadIn = 0; @@ -111,7 +111,7 @@ static pstatus_t sse2_alphaComp_argb(const BYTE* WINPR_RESTRICT pSrc1, UINT32 sr if (leadIn) { - pstatus_t status; + pstatus_t status = 0; status = generic->alphaComp_argb((const BYTE*)sptr1, src1Step, (const BYTE*)sptr2, src2Step, (BYTE*)dptr, dstStep, leadIn, 1); if (status != PRIMITIVES_SUCCESS) @@ -192,7 +192,7 @@ static pstatus_t sse2_alphaComp_argb(const BYTE* WINPR_RESTRICT pSrc1, UINT32 sr /* Finish off the remainder. */ if (pixels) { - pstatus_t status; + pstatus_t status = 0; status = generic->alphaComp_argb((const BYTE*)sptr1, src1Step, (const BYTE*)sptr2, src2Step, (BYTE*)dptr, dstStep, pixels, 1); if (status != PRIMITIVES_SUCCESS) diff --git a/libfreerdp/primitives/prim_colors.c b/libfreerdp/primitives/prim_colors.c index e587049b3..33458f451 100644 --- a/libfreerdp/primitives/prim_colors.c +++ b/libfreerdp/primitives/prim_colors.c @@ -34,8 +34,8 @@ static pstatus_t general_yCbCrToRGB_16s8u_P3AC4R_BGRX(const INT16* const WINPR_R UINT32 dstStep, UINT32 DstFormat, const prim_size_t* WINPR_RESTRICT roi) { - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; BYTE* pRGB = pDst; const INT16* pY = pSrc[0]; const INT16* pCb = pSrc[1]; @@ -48,9 +48,9 @@ static pstatus_t general_yCbCrToRGB_16s8u_P3AC4R_BGRX(const INT16* const WINPR_R { for (x = 0; x < roi->width; x++) { - INT16 R; - INT16 G; - INT16 B; + INT16 R = 0; + INT16 G = 0; + INT16 B = 0; const INT32 divisor = 16; const INT32 Y = (INT32)((UINT32)((*pY++) + 4096) << divisor); const INT32 Cb = (*pCb++); @@ -79,8 +79,8 @@ static pstatus_t general_yCbCrToRGB_16s8u_P3AC4R_general(const INT16* const WINP UINT32 dstStep, UINT32 DstFormat, const prim_size_t* WINPR_RESTRICT roi) { - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; BYTE* pRGB = pDst; const INT16* pY = pSrc[0]; const INT16* pCb = pSrc[1]; @@ -94,9 +94,9 @@ static pstatus_t general_yCbCrToRGB_16s8u_P3AC4R_general(const INT16* const WINP { for (x = 0; x < roi->width; x++) { - INT64 R; - INT64 G; - INT64 B; + INT64 R = 0; + INT64 G = 0; + INT64 B = 0; const INT32 divisor = 16; const INT32 Y = (INT32)((UINT32)((*pY++) + 4096) << divisor); const INT32 Cb = (*pCb++); @@ -164,11 +164,11 @@ general_yCbCrToRGB_16s16s_P3P3(const INT16* const WINPR_RESTRICT pSrc[3], INT32 INT16* bptr = pDst[2]; UINT32 srcbump = (srcStep - (roi->width * sizeof(UINT16))) / sizeof(UINT16); UINT32 dstbump = (dstStep - (roi->width * sizeof(UINT16))) / sizeof(UINT16); - UINT32 y; + UINT32 y = 0; for (y = 0; y < roi->height; y++) { - UINT32 x; + UINT32 x = 0; for (x = 0; x < roi->width; ++x) { @@ -178,9 +178,9 @@ general_yCbCrToRGB_16s16s_P3P3(const INT16* const WINPR_RESTRICT pSrc[3], INT32 INT32 cy = (INT32)(*yptr++); INT32 cb = (INT32)(*cbptr++); INT32 cr = (INT32)(*crptr++); - INT64 r; - INT64 g; - INT64 b; + INT64 r = 0; + INT64 g = 0; + INT64 b = 0; /* * This is the slow floating point version kept here for reference. * y = y + 4096; // 128<<5=4096 so that we can scale the sum by>>5 @@ -245,11 +245,11 @@ general_RGBToYCbCr_16s16s_P3P3(const INT16* const WINPR_RESTRICT pSrc[3], INT32 INT16* crptr = pDst[2]; UINT32 srcbump = (srcStep - (roi->width * sizeof(UINT16))) / sizeof(UINT16); UINT32 dstbump = (dstStep - (roi->width * sizeof(UINT16))) / sizeof(UINT16); - UINT32 y; + UINT32 y = 0; for (y = 0; y < roi->height; y++) { - UINT32 x; + UINT32 x = 0; for (x = 0; x < roi->width; ++x) { @@ -293,7 +293,7 @@ general_RGBToYCbCr_16s16s_P3P3(const INT16* const WINPR_RESTRICT pSrc[3], INT32 static INLINE void writeScanlineGeneric(BYTE* dst, DWORD formatSize, UINT32 DstFormat, const INT16* r, const INT16* g, const INT16* b, DWORD width) { - DWORD x; + DWORD x = 0; fkt_writePixel writePixel = getPixelWriteFunction(DstFormat, FALSE); for (x = 0; x < width; x++) @@ -303,7 +303,7 @@ static INLINE void writeScanlineGeneric(BYTE* dst, DWORD formatSize, UINT32 DstF static INLINE void writeScanlineRGB(BYTE* dst, DWORD formatSize, UINT32 DstFormat, const INT16* r, const INT16* g, const INT16* b, DWORD width) { - DWORD x; + DWORD x = 0; WINPR_UNUSED(formatSize); WINPR_UNUSED(DstFormat); @@ -321,7 +321,7 @@ static INLINE void writeScanlineRGB(BYTE* dst, DWORD formatSize, UINT32 DstForma static INLINE void writeScanlineBGR(BYTE* dst, DWORD formatSize, UINT32 DstFormat, const INT16* r, const INT16* g, const INT16* b, DWORD width) { - DWORD x; + DWORD x = 0; WINPR_UNUSED(formatSize); WINPR_UNUSED(DstFormat); @@ -339,7 +339,7 @@ static INLINE void writeScanlineBGR(BYTE* dst, DWORD formatSize, UINT32 DstForma static INLINE void writeScanlineBGRX(BYTE* dst, DWORD formatSize, UINT32 DstFormat, const INT16* r, const INT16* g, const INT16* b, DWORD width) { - DWORD x; + DWORD x = 0; WINPR_UNUSED(formatSize); WINPR_UNUSED(DstFormat); @@ -358,7 +358,7 @@ static INLINE void writeScanlineBGRX(BYTE* dst, DWORD formatSize, UINT32 DstForm static INLINE void writeScanlineRGBX(BYTE* dst, DWORD formatSize, UINT32 DstFormat, const INT16* r, const INT16* g, const INT16* b, DWORD width) { - DWORD x; + DWORD x = 0; WINPR_UNUSED(formatSize); WINPR_UNUSED(DstFormat); @@ -377,7 +377,7 @@ static INLINE void writeScanlineRGBX(BYTE* dst, DWORD formatSize, UINT32 DstForm static INLINE void writeScanlineXBGR(BYTE* dst, DWORD formatSize, UINT32 DstFormat, const INT16* r, const INT16* g, const INT16* b, DWORD width) { - DWORD x; + DWORD x = 0; WINPR_UNUSED(formatSize); WINPR_UNUSED(DstFormat); @@ -396,7 +396,7 @@ static INLINE void writeScanlineXBGR(BYTE* dst, DWORD formatSize, UINT32 DstForm static INLINE void writeScanlineXRGB(BYTE* dst, DWORD formatSize, UINT32 DstFormat, const INT16* r, const INT16* g, const INT16* b, DWORD width) { - DWORD x; + DWORD x = 0; WINPR_UNUSED(formatSize); WINPR_UNUSED(DstFormat); @@ -457,7 +457,7 @@ static pstatus_t general_RGBToRGB_16s8u_P3AC4R_general( const INT16* r = pSrc[0]; const INT16* g = pSrc[1]; const INT16* b = pSrc[2]; - UINT32 y; + UINT32 y = 0; const DWORD srcAdd = srcStep / sizeof(INT16); fkt_writeScanline writeScanline = getScanlineWriteFunction(DstFormat); const DWORD formatSize = FreeRDPGetBytesPerPixel(DstFormat); @@ -484,7 +484,7 @@ static pstatus_t general_RGBToRGB_16s8u_P3AC4R_BGRX( const INT16* r = pSrc[0]; const INT16* g = pSrc[1]; const INT16* b = pSrc[2]; - UINT32 y; + UINT32 y = 0; const DWORD srcAdd = srcStep / sizeof(INT16); const DWORD formatSize = FreeRDPGetBytesPerPixel(DstFormat); diff --git a/libfreerdp/primitives/prim_colors_opt.c b/libfreerdp/primitives/prim_colors_opt.c index 4cd6b6ca2..010626eef 100644 --- a/libfreerdp/primitives/prim_colors_opt.c +++ b/libfreerdp/primitives/prim_colors_opt.c @@ -77,16 +77,16 @@ sse2_yCbCrToRGB_16s16s_P3P3(const INT16* const WINPR_RESTRICT pSrc[3], int srcSt __m128i g_cr; __m128i b_cb; __m128i c4096; - const __m128i* y_buf; - const __m128i* cb_buf; - const __m128i* cr_buf; - __m128i* r_buf; - __m128i* g_buf; - __m128i* b_buf; - UINT32 yp; - int srcbump; - int dstbump; - int imax; + const __m128i* y_buf = NULL; + const __m128i* cb_buf = NULL; + const __m128i* cr_buf = NULL; + __m128i* r_buf = NULL; + __m128i* g_buf = NULL; + __m128i* b_buf = NULL; + UINT32 yp = 0; + int srcbump = 0; + int dstbump = 0; + int imax = 0; if (((ULONG_PTR)(pSrc[0]) & 0x0f) || ((ULONG_PTR)(pSrc[1]) & 0x0f) || ((ULONG_PTR)(pSrc[2]) & 0x0f) || ((ULONG_PTR)(pDst[0]) & 0x0f) || @@ -140,7 +140,7 @@ sse2_yCbCrToRGB_16s16s_P3P3(const INT16* const WINPR_RESTRICT pSrc[3], int srcSt for (yp = 0; yp < roi->height; ++yp) { - int i; + int i = 0; for (i = 0; i < imax; i++) { @@ -229,7 +229,7 @@ sse2_yCbCrToRGB_16s8u_P3AC4R_BGRX(const INT16* const WINPR_RESTRICT pSrc[3], UIN const UINT32 step = sizeof(__m128i) / sizeof(INT16); const UINT32 imax = (roi->width - pad) * sizeof(INT16) / sizeof(__m128i); BYTE* d_buf = pDst; - UINT32 yp; + UINT32 yp = 0; const size_t dstPad = (dstStep - roi->width * 4); #ifdef DO_PREFETCH @@ -257,7 +257,7 @@ sse2_yCbCrToRGB_16s8u_P3AC4R_BGRX(const INT16* const WINPR_RESTRICT pSrc[3], UIN for (yp = 0; yp < roi->height; ++yp) { - UINT32 i; + UINT32 i = 0; for (i = 0; i < imax; i += 2) { @@ -432,7 +432,7 @@ sse2_yCbCrToRGB_16s8u_P3AC4R_RGBX(const INT16* const WINPR_RESTRICT pSrc[3], UIN const UINT32 step = sizeof(__m128i) / sizeof(INT16); const UINT32 imax = (roi->width - pad) * sizeof(INT16) / sizeof(__m128i); BYTE* d_buf = pDst; - UINT32 yp; + UINT32 yp = 0; const size_t dstPad = (dstStep - roi->width * 4); #ifdef DO_PREFETCH @@ -460,7 +460,7 @@ sse2_yCbCrToRGB_16s8u_P3AC4R_RGBX(const INT16* const WINPR_RESTRICT pSrc[3], UIN for (yp = 0; yp < roi->height; ++yp) { - UINT32 i; + UINT32 i = 0; for (i = 0; i < imax; i += 2) { @@ -667,10 +667,10 @@ sse2_RGBToYCbCr_16s16s_P3P3(const INT16* const WINPR_RESTRICT pSrc[3], int srcSt __m128i* y_buf = (__m128i*)(pDst[0]); __m128i* cb_buf = (__m128i*)(pDst[1]); __m128i* cr_buf = (__m128i*)(pDst[2]); - UINT32 yp; - int srcbump; - int dstbump; - int imax; + UINT32 yp = 0; + int srcbump = 0; + int dstbump = 0; + int imax = 0; if (((ULONG_PTR)(pSrc[0]) & 0x0f) || ((ULONG_PTR)(pSrc[1]) & 0x0f) || ((ULONG_PTR)(pSrc[2]) & 0x0f) || ((ULONG_PTR)(pDst[0]) & 0x0f) || @@ -723,7 +723,7 @@ sse2_RGBToYCbCr_16s16s_P3P3(const INT16* const WINPR_RESTRICT pSrc[3], int srcSt for (yp = 0; yp < roi->height; ++yp) { - int i; + int i = 0; for (i = 0; i < imax; i++) { @@ -799,17 +799,17 @@ static pstatus_t sse2_RGBToRGB_16s8u_P3AC4R_BGRX( const UINT16* pb = (const UINT16*)(pSrc[2]); const UINT32 pad = roi->width % 16; const __m128i a = _mm_set1_epi32(0xFFFFFFFFU); - BYTE* out; - UINT32 srcbump; - UINT32 dstbump; - UINT32 y; + BYTE* out = NULL; + UINT32 srcbump = 0; + UINT32 dstbump = 0; + UINT32 y = 0; out = (BYTE*)pDst; srcbump = (srcStep - (roi->width * sizeof(UINT16))) / sizeof(UINT16); dstbump = (dstStep - (roi->width * sizeof(UINT32))); for (y = 0; y < roi->height; ++y) { - UINT32 x; + UINT32 x = 0; for (x = 0; x < roi->width - pad; x += 16) { @@ -913,17 +913,17 @@ static pstatus_t sse2_RGBToRGB_16s8u_P3AC4R_RGBX( const UINT16* pb = (const UINT16*)(pSrc[2]); const UINT32 pad = roi->width % 16; const __m128i a = _mm_set1_epi32(0xFFFFFFFFU); - BYTE* out; - UINT32 srcbump; - UINT32 dstbump; - UINT32 y; + BYTE* out = NULL; + UINT32 srcbump = 0; + UINT32 dstbump = 0; + UINT32 y = 0; out = (BYTE*)pDst; srcbump = (srcStep - (roi->width * sizeof(UINT16))) / sizeof(UINT16); dstbump = (dstStep - (roi->width * sizeof(UINT32))); for (y = 0; y < roi->height; ++y) { - UINT32 x; + UINT32 x = 0; for (x = 0; x < roi->width - pad; x += 16) { @@ -1027,17 +1027,17 @@ static pstatus_t sse2_RGBToRGB_16s8u_P3AC4R_XBGR( const UINT16* pb = (const UINT16*)(pSrc[2]); const UINT32 pad = roi->width % 16; const __m128i a = _mm_set1_epi32(0xFFFFFFFFU); - BYTE* out; - UINT32 srcbump; - UINT32 dstbump; - UINT32 y; + BYTE* out = NULL; + UINT32 srcbump = 0; + UINT32 dstbump = 0; + UINT32 y = 0; out = (BYTE*)pDst; srcbump = (srcStep - (roi->width * sizeof(UINT16))) / sizeof(UINT16); dstbump = (dstStep - (roi->width * sizeof(UINT32))); for (y = 0; y < roi->height; ++y) { - UINT32 x; + UINT32 x = 0; for (x = 0; x < roi->width - pad; x += 16) { @@ -1141,17 +1141,17 @@ static pstatus_t sse2_RGBToRGB_16s8u_P3AC4R_XRGB( const UINT16* pb = (const UINT16*)(pSrc[2]); const __m128i a = _mm_set1_epi32(0xFFFFFFFFU); const UINT32 pad = roi->width % 16; - BYTE* out; - UINT32 srcbump; - UINT32 dstbump; - UINT32 y; + BYTE* out = NULL; + UINT32 srcbump = 0; + UINT32 dstbump = 0; + UINT32 y = 0; out = (BYTE*)pDst; srcbump = (srcStep - (roi->width * sizeof(UINT16))) / sizeof(UINT16); dstbump = (dstStep - (roi->width * sizeof(UINT32))); for (y = 0; y < roi->height; ++y) { - UINT32 x; + UINT32 x = 0; for (x = 0; x < roi->width - pad; x += 16) { diff --git a/libfreerdp/primitives/prim_set.c b/libfreerdp/primitives/prim_set.c index 810c5b87a..c4012e645 100644 --- a/libfreerdp/primitives/prim_set.c +++ b/libfreerdp/primitives/prim_set.c @@ -41,9 +41,9 @@ static pstatus_t general_zero(void* pDst, size_t len) static pstatus_t general_set_32s(INT32 val, INT32* pDst, UINT32 len) { INT32* dptr = (INT32*)pDst; - size_t span; - size_t remaining; - primitives_t* prims; + size_t span = 0; + size_t remaining = 0; + primitives_t* prims = NULL; if (len < 256) { @@ -78,9 +78,9 @@ static pstatus_t general_set_32s(INT32 val, INT32* pDst, UINT32 len) static pstatus_t general_set_32u(UINT32 val, UINT32* pDst, UINT32 len) { UINT32* dptr = (UINT32*)pDst; - size_t span; - size_t remaining; - primitives_t* prims; + size_t span = 0; + size_t remaining = 0; + primitives_t* prims = NULL; if (len < 256) { diff --git a/libfreerdp/primitives/prim_set_opt.c b/libfreerdp/primitives/prim_set_opt.c index 685de60b5..546d1ac45 100644 --- a/libfreerdp/primitives/prim_set_opt.c +++ b/libfreerdp/primitives/prim_set_opt.c @@ -37,10 +37,10 @@ static primitives_t* generic = NULL; #if !defined(WITH_IPP) || defined(ALL_PRIMITIVES_VERSIONS) static pstatus_t sse2_set_8u(BYTE val, BYTE* WINPR_RESTRICT pDst, UINT32 len) { - BYTE byte; - BYTE* dptr; + BYTE byte = 0; + BYTE* dptr = NULL; __m128i xmm0; - size_t count; + size_t count = 0; if (len < 16) return generic->set_8u(val, pDst, len); @@ -127,7 +127,7 @@ static pstatus_t sse2_set_32u(UINT32 val, UINT32* WINPR_RESTRICT pDst, UINT32 le const primitives_t* prim = primitives_get_generic(); UINT32* dptr = (UINT32*)pDst; __m128i xmm0; - size_t count; + size_t count = 0; /* If really short, just do it here. */ if (len < 32) diff --git a/libfreerdp/primitives/prim_sign_opt.c b/libfreerdp/primitives/prim_sign_opt.c index f25e90a0b..dae76a6c9 100644 --- a/libfreerdp/primitives/prim_sign_opt.c +++ b/libfreerdp/primitives/prim_sign_opt.c @@ -35,7 +35,7 @@ static pstatus_t ssse3_sign_16s(const INT16* WINPR_RESTRICT pSrc, INT16* WINPR_R { const INT16* sptr = (const INT16*)pSrc; INT16* dptr = (INT16*)pDst; - size_t count; + size_t count = 0; if (len < 16) { diff --git a/libfreerdp/primitives/primitives.c b/libfreerdp/primitives/primitives.c index 5e725f4a2..ddc60045f 100644 --- a/libfreerdp/primitives/primitives.c +++ b/libfreerdp/primitives/primitives.c @@ -121,7 +121,7 @@ typedef struct static void primitives_YUV_benchmark_free(primitives_YUV_benchmark* bench) { - int i; + int i = 0; if (!bench) return; @@ -134,8 +134,8 @@ static void primitives_YUV_benchmark_free(primitives_YUV_benchmark* bench) static primitives_YUV_benchmark* primitives_YUV_benchmark_init(primitives_YUV_benchmark* ret) { - int i; - prim_size_t* roi; + int i = 0; + prim_size_t* roi = NULL; if (!ret) return NULL; @@ -170,10 +170,10 @@ fail: static BOOL primitives_YUV_benchmark_run(primitives_YUV_benchmark* bench, primitives_t* prims, UINT64 runTime, UINT32* computations) { - ULONGLONG dueDate; + ULONGLONG dueDate = 0; const BYTE* channels[3] = { 0 }; - size_t i; - pstatus_t status; + size_t i = 0; + pstatus_t status = 0; *computations = 0; @@ -202,7 +202,7 @@ static BOOL primitives_YUV_benchmark_run(primitives_YUV_benchmark* bench, primit static BOOL primitives_autodetect_best(primitives_t* prims) { - size_t x; + size_t x = 0; BOOL ret = FALSE; UINT64 benchDuration = 150; /* 150 ms */ struct prim_benchmark diff --git a/libfreerdp/primitives/test/TestPrimitivesAdd.c b/libfreerdp/primitives/test/TestPrimitivesAdd.c index 08120e7df..9edbae9e3 100644 --- a/libfreerdp/primitives/test/TestPrimitivesAdd.c +++ b/libfreerdp/primitives/test/TestPrimitivesAdd.c @@ -21,7 +21,7 @@ /* ========================================================================= */ static BOOL test_add16s_func(void) { - pstatus_t status; + pstatus_t status = 0; INT16 ALIGN(src1[FUNC_TEST_SIZE + 3]) = { 0 }; INT16 ALIGN(src2[FUNC_TEST_SIZE + 3]) = { 0 }; diff --git a/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c b/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c index 3d4fc004d..ab6bc4467 100644 --- a/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c +++ b/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c @@ -63,7 +63,7 @@ static UINT32 alpha_add(UINT32 c1, UINT32 c2) /* ------------------------------------------------------------------------- */ static UINT32 colordist(UINT32 c1, UINT32 c2) { - int d; + int d = 0; int maxd = 0; d = ABS((INT32)(ALF(c1) - ALF(c2))); @@ -92,8 +92,8 @@ static UINT32 colordist(UINT32 c1, UINT32 c2) static BOOL check(const BYTE* pSrc1, UINT32 src1Step, const BYTE* pSrc2, UINT32 src2Step, BYTE* pDst, UINT32 dstStep, UINT32 width, UINT32 height) { - UINT32 x; - UINT32 y; + UINT32 x = 0; + UINT32 y = 0; for (y = 0; y < height; ++y) { @@ -119,12 +119,12 @@ static BOOL check(const BYTE* pSrc1, UINT32 src1Step, const BYTE* pSrc2, UINT32 static BOOL test_alphaComp_func(void) { - pstatus_t status; + pstatus_t status = 0; BYTE ALIGN(src1[SRC1_WIDTH * SRC1_HEIGHT * 4]) = { 0 }; BYTE ALIGN(src2[SRC2_WIDTH * SRC2_HEIGHT * 4]) = { 0 }; BYTE ALIGN(dst1[DST_WIDTH * DST_HEIGHT * 4]) = { 0 }; - UINT32* ptr; - UINT32 i; + UINT32* ptr = NULL; + UINT32 i = 0; winpr_RAND(src1, sizeof(src1)); /* Special-case the first two values */ src1[0] &= 0x00FFFFFFU; @@ -166,8 +166,8 @@ static int test_alphaComp_speed(void) BYTE ALIGN(src2[SRC2_WIDTH * SRC2_HEIGHT]) = { 0 }; BYTE ALIGN(dst1[DST_WIDTH * DST_HEIGHT]) = { 0 }; char testStr[256] = { 0 }; - UINT32* ptr; - UINT32 i; + UINT32* ptr = NULL; + UINT32 i = 0; testStr[0] = '\0'; winpr_RAND(src1, sizeof(src1)); /* Special-case the first two values */ diff --git a/libfreerdp/primitives/test/TestPrimitivesAndOr.c b/libfreerdp/primitives/test/TestPrimitivesAndOr.c index f14ae9480..28baf6cc4 100644 --- a/libfreerdp/primitives/test/TestPrimitivesAndOr.c +++ b/libfreerdp/primitives/test/TestPrimitivesAndOr.c @@ -26,7 +26,7 @@ static BOOL test_and_32u_impl(const char* name, __andC_32u_t fkt, const UINT32* src, const UINT32 val, UINT32* dst, size_t size) { - size_t i; + size_t i = 0; pstatus_t status = fkt(src, val, dst, size); if (status != PRIMITIVES_SUCCESS) return FALSE; @@ -91,7 +91,7 @@ static BOOL test_and_32u_speed(void) /* ========================================================================= */ static BOOL check(const UINT32* src, const UINT32* dst, UINT32 size, UINT32 value) { - UINT32 i; + UINT32 i = 0; for (i = 0; i < size; ++i) { @@ -109,7 +109,7 @@ static BOOL check(const UINT32* src, const UINT32* dst, UINT32 size, UINT32 valu static BOOL test_or_32u_func(void) { - pstatus_t status; + pstatus_t status = 0; UINT32 ALIGN(src[FUNC_TEST_SIZE + 3]) = { 0 }; UINT32 ALIGN(dst[FUNC_TEST_SIZE + 3]) = { 0 }; diff --git a/libfreerdp/primitives/test/TestPrimitivesColors.c b/libfreerdp/primitives/test/TestPrimitivesColors.c index e5399000e..3cc2651f9 100644 --- a/libfreerdp/primitives/test/TestPrimitivesColors.c +++ b/libfreerdp/primitives/test/TestPrimitivesColors.c @@ -22,12 +22,12 @@ /* ------------------------------------------------------------------------- */ static BOOL test_RGBToRGB_16s8u_P3AC4R_func(prim_size_t roi, DWORD DstFormat) { - INT16* r; - INT16* g; - INT16* b; - BYTE* out1; - BYTE* out2; - UINT64 i; + INT16* r = NULL; + INT16* g = NULL; + INT16* b = NULL; + BYTE* out1 = NULL; + BYTE* out2 = NULL; + UINT64 i = 0; BOOL failed = FALSE; const INT16* ptrs[3]; const UINT32 rgbStride = roi.width * 2; @@ -129,7 +129,7 @@ static BOOL test_RGBToRGB_16s8u_P3AC4R_speed(void) INT16 ALIGN(g[4096 + 1]); INT16 ALIGN(b[4096 + 1]); UINT32 ALIGN(dst[4096 + 1]); - int i; + int i = 0; INT16* ptrs[3]; winpr_RAND(r, sizeof(r)); winpr_RAND(g, sizeof(g)); @@ -164,7 +164,7 @@ static BOOL test_RGBToRGB_16s8u_P3AC4R_speed(void) /* ========================================================================= */ static BOOL test_yCbCrToRGB_16s16s_P3P3_func(void) { - pstatus_t status; + pstatus_t status = 0; INT16 ALIGN(y[4096]) = { 0 }; INT16 ALIGN(cb[4096]) = { 0 }; INT16 ALIGN(cr[4096]) = { 0 }; @@ -174,7 +174,7 @@ static BOOL test_yCbCrToRGB_16s16s_P3P3_func(void) INT16 ALIGN(r2[4096]) = { 0 }; INT16 ALIGN(g2[4096]) = { 0 }; INT16 ALIGN(b2[4096]) = { 0 }; - int i; + int i = 0; const INT16* in[3]; INT16* out1[3]; INT16* out2[3]; @@ -234,7 +234,7 @@ static int test_yCbCrToRGB_16s16s_P3P3_speed(void) INT16 ALIGN(r[4096]); INT16 ALIGN(g[4096]); INT16 ALIGN(b[4096]); - int i; + int i = 0; const INT16* input[3]; INT16* output[3]; winpr_RAND(y, sizeof(y)); @@ -270,7 +270,7 @@ int TestPrimitivesColors(int argc, char* argv[]) const DWORD formats[] = { PIXEL_FORMAT_ARGB32, PIXEL_FORMAT_XRGB32, PIXEL_FORMAT_ABGR32, PIXEL_FORMAT_XBGR32, PIXEL_FORMAT_RGBA32, PIXEL_FORMAT_RGBX32, PIXEL_FORMAT_BGRA32, PIXEL_FORMAT_BGRX32 }; - DWORD x; + DWORD x = 0; prim_size_t roi = { 1920 / 4, 1080 / 4 }; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/libfreerdp/primitives/test/TestPrimitivesCopy.c b/libfreerdp/primitives/test/TestPrimitivesCopy.c index 59b3f4034..db29305b1 100644 --- a/libfreerdp/primitives/test/TestPrimitivesCopy.c +++ b/libfreerdp/primitives/test/TestPrimitivesCopy.c @@ -24,17 +24,17 @@ static BOOL test_copy8u_func(void) { primitives_t* prims = primitives_get(); BYTE ALIGN(data[COPY_TESTSIZE + 15]) = { 0 }; - int i; - int soff; + int i = 0; + int soff = 0; winpr_RAND(data, sizeof(data)); for (soff = 0; soff < 16; ++soff) { - int doff; + int doff = 0; for (doff = 0; doff < 16; ++doff) { - int length; + int length = 0; for (length = 1; length <= COPY_TESTSIZE - doff; ++length) { diff --git a/libfreerdp/primitives/test/TestPrimitivesSet.c b/libfreerdp/primitives/test/TestPrimitivesSet.c index eaf7ba0a0..00acc24c7 100644 --- a/libfreerdp/primitives/test/TestPrimitivesSet.c +++ b/libfreerdp/primitives/test/TestPrimitivesSet.c @@ -20,7 +20,7 @@ /* ------------------------------------------------------------------------- */ static BOOL check8(const BYTE* src, UINT32 length, UINT32 offset, BYTE value) { - UINT32 i; + UINT32 i = 0; for (i = 0; i < length; ++i) { @@ -38,12 +38,12 @@ static BOOL check8(const BYTE* src, UINT32 length, UINT32 offset, BYTE value) static BOOL test_set8u_func(void) { - pstatus_t status; - UINT32 off; + pstatus_t status = 0; + UINT32 off = 0; for (off = 0; off < 16; ++off) { - UINT32 len; + UINT32 len = 0; BYTE dest[1024]; memset(dest, 3, sizeof(dest)); @@ -61,7 +61,7 @@ static BOOL test_set8u_func(void) for (off = 0; off < 16; ++off) { - UINT32 len; + UINT32 len = 0; BYTE dest[1024]; memset(dest, 3, sizeof(dest)); @@ -84,8 +84,8 @@ static BOOL test_set8u_func(void) static BOOL test_set8u_speed(void) { BYTE dest[1024]; - BYTE value; - UINT32 x; + BYTE value = 0; + UINT32 x = 0; for (x = 0; x < 16; x++) { @@ -101,7 +101,7 @@ static BOOL test_set8u_speed(void) static BOOL check32s(const INT32* src, UINT32 length, UINT32 offset, INT32 value) { - UINT32 i; + UINT32 i = 0; for (i = 0; i < length; ++i) { @@ -120,13 +120,13 @@ static BOOL check32s(const INT32* src, UINT32 length, UINT32 offset, INT32 value /* ------------------------------------------------------------------------- */ static BOOL test_set32s_func(void) { - pstatus_t status; - UINT32 off; + pstatus_t status = 0; + UINT32 off = 0; const INT32 value = -0x12345678; for (off = 0; off < 16; ++off) { - UINT32 len; + UINT32 len = 0; INT32 dest[1024] = { 0 }; for (len = 1; len < 48 - off; ++len) @@ -143,7 +143,7 @@ static BOOL test_set32s_func(void) for (off = 0; off < 16; ++off) { - UINT32 len; + UINT32 len = 0; INT32 dest[1024] = { 0 }; for (len = 1; len < 48 - off; ++len) @@ -163,7 +163,7 @@ static BOOL test_set32s_func(void) static BOOL check32u(const UINT32* src, UINT32 length, UINT32 offset, UINT32 value) { - UINT32 i; + UINT32 i = 0; for (i = 0; i < length; ++i) { @@ -182,13 +182,13 @@ static BOOL check32u(const UINT32* src, UINT32 length, UINT32 offset, UINT32 val /* ------------------------------------------------------------------------- */ static BOOL test_set32u_func(void) { - pstatus_t status; - UINT32 off; + pstatus_t status = 0; + UINT32 off = 0; const UINT32 value = 0xABCDEF12; for (off = 0; off < 16; ++off) { - UINT32 len; + UINT32 len = 0; UINT32 dest[1024] = { 0 }; for (len = 1; len < 48 - off; ++len) @@ -205,7 +205,7 @@ static BOOL test_set32u_func(void) for (off = 0; off < 16; ++off) { - UINT32 len; + UINT32 len = 0; UINT32 dest[1024] = { 0 }; for (len = 1; len < 48 - off; ++len) @@ -227,8 +227,8 @@ static BOOL test_set32u_func(void) static BOOL test_set32u_speed(void) { UINT32 dest[1024]; - BYTE value; - UINT32 x; + BYTE value = 0; + UINT32 x = 0; for (x = 0; x < 16; x++) { @@ -246,8 +246,8 @@ static BOOL test_set32u_speed(void) static BOOL test_set32s_speed(void) { INT32 dest[1024]; - BYTE value; - UINT32 x; + BYTE value = 0; + UINT32 x = 0; for (x = 0; x < 16; x++) { diff --git a/libfreerdp/primitives/test/TestPrimitivesShift.c b/libfreerdp/primitives/test/TestPrimitivesShift.c index babc732eb..884583838 100644 --- a/libfreerdp/primitives/test/TestPrimitivesShift.c +++ b/libfreerdp/primitives/test/TestPrimitivesShift.c @@ -21,10 +21,10 @@ static BOOL test_lShift_16s_func(void) { - pstatus_t status; + pstatus_t status = 0; INT16 ALIGN(src[FUNC_TEST_SIZE + 3]); INT16 ALIGN(d1[FUNC_TEST_SIZE + 3]); - UINT32 val; + UINT32 val = 0; winpr_RAND(&val, sizeof(val)); winpr_RAND(src, sizeof(src)); val = val % 16; @@ -66,10 +66,10 @@ static BOOL test_lShift_16s_func(void) static BOOL test_lShift_16u_func(void) { - pstatus_t status; + pstatus_t status = 0; UINT16 ALIGN(src[FUNC_TEST_SIZE + 3]); UINT16 ALIGN(d1[FUNC_TEST_SIZE + 3]); - UINT32 val; + UINT32 val = 0; winpr_RAND(&val, sizeof(val)); winpr_RAND(src, sizeof(src)); val = val % 16; @@ -112,10 +112,10 @@ static BOOL test_lShift_16u_func(void) static BOOL test_rShift_16s_func(void) { - pstatus_t status; + pstatus_t status = 0; INT16 ALIGN(src[FUNC_TEST_SIZE + 3]); INT16 ALIGN(d1[FUNC_TEST_SIZE + 3]); - UINT32 val; + UINT32 val = 0; winpr_RAND(&val, sizeof(val)); winpr_RAND(src, sizeof(src)); val = val % 16; @@ -158,10 +158,10 @@ static BOOL test_rShift_16s_func(void) static BOOL test_rShift_16u_func(void) { - pstatus_t status; + pstatus_t status = 0; UINT16 ALIGN(src[FUNC_TEST_SIZE + 3]); UINT16 ALIGN(d1[FUNC_TEST_SIZE + 3]); - UINT32 val; + UINT32 val = 0; winpr_RAND(&val, sizeof(val)); winpr_RAND(src, sizeof(src)); val = val % 16; @@ -203,11 +203,11 @@ static BOOL test_rShift_16u_func(void) static BOOL test_ShiftWrapper_16s_func(void) { - pstatus_t status; + pstatus_t status = 0; INT16 ALIGN(src[FUNC_TEST_SIZE + 3]); INT16 ALIGN(d1[FUNC_TEST_SIZE + 3]); - UINT32 tmp; - INT32 val; + UINT32 tmp = 0; + INT32 val = 0; winpr_RAND(&tmp, sizeof(tmp)); winpr_RAND(src, sizeof(src)); val = tmp % 16; @@ -270,11 +270,11 @@ static BOOL test_ShiftWrapper_16s_func(void) static BOOL test_ShiftWrapper_16u_func(void) { - pstatus_t status; + pstatus_t status = 0; UINT16 ALIGN(src[FUNC_TEST_SIZE + 3]); UINT16 ALIGN(d1[FUNC_TEST_SIZE + 3]); - UINT32 tmp; - INT32 val; + UINT32 tmp = 0; + INT32 val = 0; winpr_RAND(&tmp, sizeof(tmp)); winpr_RAND(src, sizeof(src)); val = tmp % 16; @@ -337,7 +337,7 @@ static BOOL test_ShiftWrapper_16u_func(void) /* ------------------------------------------------------------------------- */ static BOOL test_lShift_16s_speed(void) { - UINT32 val; + UINT32 val = 0; INT16 ALIGN(src[MAX_TEST_SIZE + 1]); INT16 ALIGN(dst[MAX_TEST_SIZE + 1]); winpr_RAND(src, sizeof(src)); @@ -358,7 +358,7 @@ static BOOL test_lShift_16s_speed(void) /* ------------------------------------------------------------------------- */ static BOOL test_lShift_16u_speed(void) { - UINT32 val; + UINT32 val = 0; UINT16 ALIGN(src[MAX_TEST_SIZE + 1]); UINT16 ALIGN(dst[MAX_TEST_SIZE + 1]); winpr_RAND(&val, sizeof(val)); @@ -379,7 +379,7 @@ static BOOL test_lShift_16u_speed(void) /* ------------------------------------------------------------------------- */ static BOOL test_rShift_16s_speed(void) { - UINT32 val; + UINT32 val = 0; INT16 ALIGN(src[MAX_TEST_SIZE + 1]); INT16 ALIGN(dst[MAX_TEST_SIZE + 1]); winpr_RAND(src, sizeof(src)); @@ -400,7 +400,7 @@ static BOOL test_rShift_16s_speed(void) /* ------------------------------------------------------------------------- */ static BOOL test_rShift_16u_speed(void) { - UINT32 val; + UINT32 val = 0; UINT16 ALIGN(src[MAX_TEST_SIZE + 1]); UINT16 ALIGN(dst[MAX_TEST_SIZE + 1]); winpr_RAND(&val, sizeof(val)); diff --git a/libfreerdp/primitives/test/TestPrimitivesSign.c b/libfreerdp/primitives/test/TestPrimitivesSign.c index 76d12b793..fb9549ae9 100644 --- a/libfreerdp/primitives/test/TestPrimitivesSign.c +++ b/libfreerdp/primitives/test/TestPrimitivesSign.c @@ -22,7 +22,7 @@ /* ------------------------------------------------------------------------- */ static BOOL test_sign16s_func(void) { - pstatus_t status; + pstatus_t status = 0; INT16 ALIGN(src[TEST_BUFFER_SIZE + 16]) = { 0 }; INT16 ALIGN(d1[TEST_BUFFER_SIZE + 16]) = { 0 }; INT16 ALIGN(d2[TEST_BUFFER_SIZE + 16]) = { 0 }; diff --git a/libfreerdp/primitives/test/TestPrimitivesYCbCr.c b/libfreerdp/primitives/test/TestPrimitivesYCbCr.c index 0c9ca9e20..8a2b3a788 100644 --- a/libfreerdp/primitives/test/TestPrimitivesYCbCr.c +++ b/libfreerdp/primitives/test/TestPrimitivesYCbCr.c @@ -1488,7 +1488,7 @@ static const UINT32 TEST_XRGB_IMAGE[4096] = { static int test_bmp_cmp_count(const BYTE* mem1, const BYTE* mem2, int size, int channel, int margin) { - int error; + int error = 0; int count = 0; int index = 0; size /= 4; @@ -1533,12 +1533,12 @@ static int test_bmp_cmp_dump(const BYTE* actual, const BYTE* expected, int size, const INT16 Cr = TEST_CR_COMPONENT[index]; const int x = index % 64; const int y = (index - x) / 64; - BYTE R; - BYTE G; - BYTE B; - BYTE eR; - BYTE eG; - BYTE eB; + BYTE R = 0; + BYTE G = 0; + BYTE B = 0; + BYTE eR = 0; + BYTE eG = 0; + BYTE eB = 0; FreeRDPSplitColor(pixel, PIXEL_FORMAT_XRGB32, &R, &G, &B, NULL, NULL); FreeRDPSplitColor(ePixel, PIXEL_FORMAT_XRGB32, &eR, &eG, &eB, NULL, NULL); @@ -1576,8 +1576,8 @@ static int test_PrimitivesYCbCr(const primitives_t* prims, UINT32 format, prim_s pstatus_t status = -1; int cnt[3]; float err[3]; - BYTE* actual; - BYTE* actual1; + BYTE* actual = NULL; + BYTE* actual1 = NULL; const BYTE* expected = (const BYTE*)TEST_XRGB_IMAGE; int margin = 1; INT16* pYCbCr[3] = { NULL, NULL, NULL }; @@ -1727,7 +1727,7 @@ int TestPrimitivesYCbCr(int argc, char* argv[]) PIXEL_FORMAT_BGRA32, PIXEL_FORMAT_BGRX32 }; const primitives_t* prims = primitives_get(); const primitives_t* generics = primitives_get_generic(); - UINT32 x; + UINT32 x = 0; WINPR_UNUSED(argv); @@ -1738,7 +1738,7 @@ int TestPrimitivesYCbCr(int argc, char* argv[]) for (x = 0; x < sizeof(formats) / sizeof(formats[0]); x++) { prim_size_t roi = { 64, 64 }; - int rc; + int rc = 0; printf("----------------------- GENERIC %s [%" PRIu32 "x%" PRIu32 "] COMPARE CONTENT ----\n", FreeRDPGetColorFormatName(formats[x]), roi.width, roi.height); @@ -1779,7 +1779,7 @@ int TestPrimitivesYCbCr(int argc, char* argv[]) for (x = 0; x < sizeof(formats) / sizeof(formats[0]); x++) { - int rc; + int rc = 0; printf("----------------------- GENERIC %s [%" PRIu32 "x%" PRIu32 "] COMPARE CONTENT ----\n", FreeRDPGetColorFormatName(formats[x]), roi.width, roi.height); @@ -1810,7 +1810,7 @@ int TestPrimitivesYCbCr(int argc, char* argv[]) for (x = 0; x < sizeof(formats) / sizeof(formats[0]); x++) { - int rc; + int rc = 0; printf("----------------------- GENERIC %s [%" PRIu32 "x%" PRIu32 "] COMPARE CONTENT ----\n", FreeRDPGetColorFormatName(formats[x]), roi.width, roi.height); diff --git a/libfreerdp/primitives/test/TestPrimitivesYCoCg.c b/libfreerdp/primitives/test/TestPrimitivesYCoCg.c index c7edb434b..06a31df40 100644 --- a/libfreerdp/primitives/test/TestPrimitivesYCoCg.c +++ b/libfreerdp/primitives/test/TestPrimitivesYCoCg.c @@ -29,8 +29,8 @@ static BOOL test_YCoCgRToRGB_8u_AC4R_func(UINT32 width, UINT32 height) BYTE* out_sse = NULL; BYTE* in = NULL; BYTE* out_c = NULL; - UINT32 i; - UINT32 x; + UINT32 i = 0; + UINT32 x = 0; const UINT32 srcStride = width * 4; const UINT32 size = srcStride * height; const UINT32 formats[] = { PIXEL_FORMAT_ARGB32, PIXEL_FORMAT_ABGR32, PIXEL_FORMAT_RGBA32, @@ -117,12 +117,12 @@ int TestPrimitivesYCoCg(int argc, char* argv[]) /* Random resolution tests */ if (argc < 2) { - UINT32 x; + UINT32 x = 0; for (x = 0; x < 10; x++) { - UINT32 w; - UINT32 h; + UINT32 w = 0; + UINT32 h = 0; do { diff --git a/libfreerdp/primitives/test/TestPrimitivesYUV.c b/libfreerdp/primitives/test/TestPrimitivesYUV.c index ccaa0e722..9eb39bda3 100644 --- a/libfreerdp/primitives/test/TestPrimitivesYUV.c +++ b/libfreerdp/primitives/test/TestPrimitivesYUV.c @@ -18,7 +18,7 @@ * differing by less than 2 abs equal. */ static BOOL similar(const BYTE* src, const BYTE* dst, size_t size) { - size_t x; + size_t x = 0; for (x = 0; x < size; x++) { @@ -37,7 +37,7 @@ static BOOL similar(const BYTE* src, const BYTE* dst, size_t size) static BOOL similarRGB(const BYTE* src, const BYTE* dst, size_t size, UINT32 format, BOOL use444) { - size_t x; + size_t x = 0; const UINT32 bpp = FreeRDPGetBytesPerPixel(format); BYTE fill = PADDING_FILL_VALUE; if (!FreeRDPColorHasAlpha(format)) @@ -46,16 +46,16 @@ static BOOL similarRGB(const BYTE* src, const BYTE* dst, size_t size, UINT32 for for (x = 0; x < size; x++) { const double maxDiff = 4.0; - UINT32 sColor; - UINT32 dColor; - BYTE sR; - BYTE sG; - BYTE sB; - BYTE sA; - BYTE dR; - BYTE dG; - BYTE dB; - BYTE dA; + UINT32 sColor = 0; + UINT32 dColor = 0; + BYTE sR = 0; + BYTE sG = 0; + BYTE sB = 0; + BYTE sA = 0; + BYTE dR = 0; + BYTE dG = 0; + BYTE dB = 0; + BYTE dA = 0; sColor = FreeRDPReadColor(src, format); dColor = FreeRDPReadColor(dst, format); src += bpp; @@ -96,10 +96,10 @@ static void get_size(BOOL large, UINT32* width, UINT32* height) static BOOL check_padding(const BYTE* psrc, size_t size, size_t padding, const char* buffer) { - size_t x; + size_t x = 0; BOOL rc = TRUE; - const BYTE* src; - const BYTE* esrc; + const BYTE* src = NULL; + const BYTE* esrc = NULL; size_t halfPad = (padding + 1) / 2; if (!psrc) @@ -146,7 +146,7 @@ static BOOL check_padding(const BYTE* psrc, size_t size, size_t padding, const c static void* set_padding(size_t size, size_t padding) { size_t halfPad = (padding + 1) / 2; - BYTE* psrc; + BYTE* psrc = NULL; BYTE* src = winpr_aligned_malloc(size + 2 * halfPad, 16); if (!src) @@ -168,7 +168,7 @@ static void* set_padding(size_t size, size_t padding) static void free_padding(void* src, size_t padding) { - BYTE* ptr; + BYTE* ptr = NULL; if (!src) return; @@ -186,11 +186,11 @@ static BOOL TestPrimitiveYUVCombine(primitives_t* prims, prim_size_t roi) const BYTE** cpv; BYTE** pv; } cnv; - UINT32 x; - UINT32 y; - UINT32 i; - UINT32 awidth; - UINT32 aheight; + UINT32 x = 0; + UINT32 y = 0; + UINT32 i = 0; + UINT32 awidth = 0; + UINT32 aheight = 0; BOOL rc = FALSE; BYTE* luma[3] = { 0 }; BYTE* chroma[3] = { 0 }; @@ -395,19 +395,19 @@ static BOOL TestPrimitiveYUV(primitives_t* prims, prim_size_t roi, BOOL use444) BYTE** pv; } cnv; BOOL res = FALSE; - UINT32 x; - UINT32 y; - UINT32 awidth; - UINT32 aheight; + UINT32 x = 0; + UINT32 y = 0; + UINT32 awidth = 0; + UINT32 aheight = 0; BYTE* yuv[3] = { 0 }; UINT32 yuv_step[3]; BYTE* rgb = NULL; BYTE* rgb_dst = NULL; - size_t size; - size_t uvsize; - size_t uvwidth; + size_t size = 0; + size_t uvsize = 0; + size_t uvwidth = 0; size_t padding = 100 * 16; - UINT32 stride; + UINT32 stride = 0; const UINT32 formats[] = { PIXEL_FORMAT_XRGB32, PIXEL_FORMAT_XBGR32, PIXEL_FORMAT_ARGB32, PIXEL_FORMAT_ABGR32, PIXEL_FORMAT_RGBA32, PIXEL_FORMAT_RGBX32, PIXEL_FORMAT_BGRA32, PIXEL_FORMAT_BGRX32 }; @@ -476,7 +476,7 @@ static BOOL TestPrimitiveYUV(primitives_t* prims, prim_size_t roi, BOOL use444) for (x = 0; x < sizeof(formats) / sizeof(formats[0]); x++) { - pstatus_t rc; + pstatus_t rc = 0; const UINT32 DstFormat = formats[x]; printf("Testing destination color format %s\n", FreeRDPGetColorFormatName(DstFormat)); memset(rgb_dst, PADDING_FILL_VALUE, size * sizeof(UINT32)); @@ -645,7 +645,7 @@ static BOOL check_yuv420(BYTE** planes, UINT32 width, UINT32 height, UINT32 padd static BOOL check_for_mismatches(const BYTE* planeA, const BYTE* planeB, UINT32 size) { BOOL rc = FALSE; - UINT32 x; + UINT32 x = 0; for (x = 0; x < size; x++) { @@ -694,24 +694,24 @@ static BOOL compare_yuv420(BYTE** planesA, BYTE** planesB, UINT32 width, UINT32 static BOOL TestPrimitiveRgbToLumaChroma(primitives_t* prims, prim_size_t roi, UINT32 version) { BOOL res = FALSE; - UINT32 x; - UINT32 y; - UINT32 cnt; - UINT32 awidth; - UINT32 aheight; + UINT32 x = 0; + UINT32 y = 0; + UINT32 cnt = 0; + UINT32 awidth = 0; + UINT32 aheight = 0; BYTE* luma[3] = { 0 }; BYTE* chroma[3] = { 0 }; BYTE* lumaGeneric[3] = { 0 }; BYTE* chromaGeneric[3] = { 0 }; UINT32 yuv_step[3]; BYTE* rgb = NULL; - size_t size; - size_t uvsize; - size_t uvwidth; + size_t size = 0; + size_t uvsize = 0; + size_t uvwidth = 0; const size_t padding = 0x1000; - UINT32 stride; - __RGBToAVC444YUV_t fkt; - __RGBToAVC444YUV_t gen; + UINT32 stride = 0; + __RGBToAVC444YUV_t fkt = NULL; + __RGBToAVC444YUV_t gen = NULL; const UINT32 formats[] = { PIXEL_FORMAT_XRGB32, PIXEL_FORMAT_XBGR32, PIXEL_FORMAT_ARGB32, PIXEL_FORMAT_ABGR32, PIXEL_FORMAT_RGBA32, PIXEL_FORMAT_RGBX32, PIXEL_FORMAT_BGRA32, PIXEL_FORMAT_BGRX32 }; @@ -888,7 +888,7 @@ fail: int TestPrimitivesYUV(int argc, char* argv[]) { BOOL large = (argc > 1); - UINT32 x; + UINT32 x = 0; int rc = -1; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/libfreerdp/primitives/test/prim_test.c b/libfreerdp/primitives/test/prim_test.c index d11fd49ac..d9d642de7 100644 --- a/libfreerdp/primitives/test/prim_test.c +++ b/libfreerdp/primitives/test/prim_test.c @@ -18,6 +18,7 @@ #ifndef _WIN32 #include +#include #include #include #endif @@ -45,7 +46,7 @@ float _delta_time(const struct timespec* t0, const struct timespec* t1) { INT64 secs = (INT64)(t1->tv_sec) - (INT64)(t0->tv_sec); long nsecs = t1->tv_nsec - t0->tv_nsec; - double retval; + double retval = NAN; if (nsecs < 0) { @@ -63,7 +64,7 @@ void _floatprint(float t, char* output) { /* I don't want to link against -lm, so avoid log,exp,... */ float f = 10.0; - int i; + int i = 0; while (t > f) f *= 10.0; @@ -97,7 +98,7 @@ void prim_test_setup(BOOL performance) BOOL speed_test(const char* name, const char* dsc, UINT32 iterations, pstatus_t (*fkt_generic)(), pstatus_t (*optimised)(), ...) { - UINT32 i; + UINT32 i = 0; if (!name || !generic || !optimised || (iterations == 0)) return FALSE; diff --git a/libfreerdp/utils/cliprdr_utils.c b/libfreerdp/utils/cliprdr_utils.c index 91b67610d..5835ab6e5 100644 --- a/libfreerdp/utils/cliprdr_utils.c +++ b/libfreerdp/utils/cliprdr_utils.c @@ -195,7 +195,7 @@ UINT cliprdr_serialize_file_list_ex(UINT32 flags, const FILEDESCRIPTORW* file_de UINT32* format_data_length) { UINT result = NO_ERROR; - size_t len; + size_t len = 0; wStream* s = NULL; if (!file_descriptor_array || !format_data || !format_data_length) diff --git a/libfreerdp/utils/encoded_types.c b/libfreerdp/utils/encoded_types.c index 56c32f248..68e6e4d63 100644 --- a/libfreerdp/utils/encoded_types.c +++ b/libfreerdp/utils/encoded_types.c @@ -68,7 +68,7 @@ typedef struct BOOL freerdp_read_four_byte_signed_integer(wStream* s, INT32* value) { FOUR_BYTE_SIGNED_INTEGER si = { 0 }; - BYTE byte; + BYTE byte = 0; WINPR_ASSERT(s); WINPR_ASSERT(value); @@ -126,8 +126,8 @@ BOOL freerdp_read_four_byte_signed_integer(wStream* s, INT32* value) BOOL freerdp_read_four_byte_float(wStream* s, double* value) { FOUR_BYTE_FLOAT f = { 0 }; - UINT32 base; - BYTE byte; + UINT32 base = 0; + BYTE byte = 0; WINPR_ASSERT(s); WINPR_ASSERT(value); diff --git a/libfreerdp/utils/passphrase.c b/libfreerdp/utils/passphrase.c index e568cd8de..96f5a3185 100644 --- a/libfreerdp/utils/passphrase.c +++ b/libfreerdp/utils/passphrase.c @@ -84,7 +84,7 @@ char* freerdp_passphrase_read(rdpContext* context, const char* prompt, char* buf static int wait_for_fd(int fd, int timeout) { - int status; + int status = 0; #if defined(WINPR_HAVE_POLL_H) && !defined(__APPLE__) struct pollfd pollset = { 0 }; pollset.fd = fd; @@ -121,7 +121,7 @@ static void replace_char(char* buffer, size_t buffer_len, const char* toreplace) { while (*toreplace != '\0') { - char* ptr; + char* ptr = NULL; while ((ptr = strrchr(buffer, *toreplace)) != NULL) *ptr = '\0'; toreplace++; @@ -133,7 +133,7 @@ char* freerdp_passphrase_read(rdpContext* context, const char* prompt, char* buf { BOOL terminal_needs_reset = FALSE; char term_name[L_ctermid] = { 0 }; - int term_file; + int term_file = 0; FILE* fout = NULL; @@ -144,7 +144,7 @@ char* freerdp_passphrase_read(rdpContext* context, const char* prompt, char* buf } ctermid(term_name); - int terminal_fildes; + int terminal_fildes = 0; if (from_stdin || strcmp(term_name, "") == 0 || (term_file = open(term_name, O_RDWR)) == -1) { fout = stdout; @@ -255,8 +255,8 @@ int freerdp_interruptible_getc(rdpContext* context, FILE* f) SSIZE_T freerdp_interruptible_get_line(rdpContext* context, char** plineptr, size_t* psize, FILE* stream) { - int c; - char* n; + int c = 0; + char* n = NULL; size_t step = 32; size_t used = 0; char* ptr = NULL; diff --git a/libfreerdp/utils/pcap.c b/libfreerdp/utils/pcap.c index a0ea11c2b..db5090901 100644 --- a/libfreerdp/utils/pcap.c +++ b/libfreerdp/utils/pcap.c @@ -131,7 +131,7 @@ static BOOL pcap_write_record(rdpPcap* pcap, const pcap_record* record) BOOL pcap_add_record(rdpPcap* pcap, const void* data, size_t length) { - pcap_record* record; + pcap_record* record = NULL; struct timeval tp; WINPR_ASSERT(pcap); @@ -213,7 +213,7 @@ BOOL pcap_get_next_record(rdpPcap* pcap, pcap_record* record) rdpPcap* pcap_open(const char* name, BOOL write) { - rdpPcap* pcap; + rdpPcap* pcap = NULL; WINPR_ASSERT(name); diff --git a/libfreerdp/utils/ringbuffer.c b/libfreerdp/utils/ringbuffer.c index ca9f2d8cc..d8390de8d 100644 --- a/libfreerdp/utils/ringbuffer.c +++ b/libfreerdp/utils/ringbuffer.c @@ -71,7 +71,7 @@ void ringbuffer_destroy(RingBuffer* rb) static BOOL ringbuffer_realloc(RingBuffer* rb, size_t targetSize) { - BYTE* newData; + BYTE* newData = NULL; DEBUG_RINGBUFFER("ringbuffer_realloc(%p): targetSize: %" PRIdz "", (void*)rb, targetSize); if (rb->writePtr == rb->readPtr) @@ -160,8 +160,8 @@ static BOOL ringbuffer_realloc(RingBuffer* rb, size_t targetSize) */ BOOL ringbuffer_write(RingBuffer* rb, const BYTE* ptr, size_t sz) { - size_t toWrite; - size_t remaining; + size_t toWrite = 0; + size_t remaining = 0; DEBUG_RINGBUFFER("ringbuffer_write(%p): sz: %" PRIdz "", (void*)rb, sz); if ((rb->freeSize <= sz) && !ringbuffer_realloc(rb, rb->size + sz)) @@ -243,7 +243,7 @@ BOOL ringbuffer_commit_written_bytes(RingBuffer* rb, size_t sz) int ringbuffer_peek(const RingBuffer* rb, DataChunk chunks[2], size_t sz) { size_t remaining = sz; - size_t toRead; + size_t toRead = 0; int chunkIndex = 0; int status = 0; DEBUG_RINGBUFFER("ringbuffer_peek(%p): sz: %" PRIdz "", (void*)rb, sz); diff --git a/libfreerdp/utils/smartcard_call.c b/libfreerdp/utils/smartcard_call.c index ddae1c603..ded5885bc 100644 --- a/libfreerdp/utils/smartcard_call.c +++ b/libfreerdp/utils/smartcard_call.c @@ -87,7 +87,7 @@ struct s_scard_context_element static LONG smartcard_EstablishContext_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; SCARDCONTEXT hContext = { 0 }; EstablishContext_Return ret = { 0 }; EstablishContext_Call* call = &operation->call.establishContext; @@ -181,7 +181,7 @@ static LONG smartcard_IsValidContext_Call(scard_call_context* smartcard, wStream static LONG smartcard_ListReaderGroupsA_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; ListReaderGroups_Return ret = { 0 }; LPSTR mszGroups = NULL; DWORD cchGroups = 0; @@ -210,7 +210,7 @@ static LONG smartcard_ListReaderGroupsA_Call(scard_call_context* smartcard, wStr static LONG smartcard_ListReaderGroupsW_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; ListReaderGroups_Return ret = { 0 }; LPWSTR mszGroups = NULL; DWORD cchGroups = 0; @@ -299,7 +299,7 @@ static DWORD filter_device_by_name_a(wLinkedList* list, LPSTR* mszReaders, DWORD static DWORD filter_device_by_name_w(wLinkedList* list, LPWSTR* mszReaders, DWORD cchReaders) { - DWORD rc; + DWORD rc = 0; LPSTR readers = NULL; if (LinkedList_Count(list) < 1) @@ -328,11 +328,11 @@ static DWORD filter_device_by_name_w(wLinkedList* list, LPWSTR* mszReaders, DWOR static LONG smartcard_ListReadersA_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; ListReaders_Return ret = { 0 }; LPSTR mszReaders = NULL; DWORD cchReaders = 0; - ListReaders_Call* call; + ListReaders_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -370,10 +370,10 @@ static LONG smartcard_ListReadersA_Call(scard_call_context* smartcard, wStream* static LONG smartcard_ListReadersW_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; ListReaders_Return ret = { 0 }; DWORD cchReaders = 0; - ListReaders_Call* call; + ListReaders_Call* call = NULL; union { const BYTE* bp; @@ -419,7 +419,7 @@ static LONG smartcard_IntroduceReaderGroupA_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - ContextAndStringA_Call* call; + ContextAndStringA_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -436,7 +436,7 @@ static LONG smartcard_IntroduceReaderGroupW_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - ContextAndStringW_Call* call; + ContextAndStringW_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -453,7 +453,7 @@ static LONG smartcard_IntroduceReaderA_Call(scard_call_context* smartcard, wStre SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - ContextAndTwoStringA_Call* call; + ContextAndTwoStringA_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -471,7 +471,7 @@ static LONG smartcard_IntroduceReaderW_Call(scard_call_context* smartcard, wStre SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - ContextAndTwoStringW_Call* call; + ContextAndTwoStringW_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -489,7 +489,7 @@ static LONG smartcard_ForgetReaderA_Call(scard_call_context* smartcard, wStream* SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - ContextAndStringA_Call* call; + ContextAndStringA_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -506,7 +506,7 @@ static LONG smartcard_ForgetReaderW_Call(scard_call_context* smartcard, wStream* SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - ContextAndStringW_Call* call; + ContextAndStringW_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -523,7 +523,7 @@ static LONG smartcard_AddReaderToGroupA_Call(scard_call_context* smartcard, wStr SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - ContextAndTwoStringA_Call* call; + ContextAndTwoStringA_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -541,7 +541,7 @@ static LONG smartcard_AddReaderToGroupW_Call(scard_call_context* smartcard, wStr SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - ContextAndTwoStringW_Call* call; + ContextAndTwoStringW_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -559,7 +559,7 @@ static LONG smartcard_RemoveReaderFromGroupA_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - ContextAndTwoStringA_Call* call; + ContextAndTwoStringA_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -577,7 +577,7 @@ static LONG smartcard_RemoveReaderFromGroupW_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - ContextAndTwoStringW_Call* call; + ContextAndTwoStringW_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -594,10 +594,10 @@ static LONG smartcard_RemoveReaderFromGroupW_Call(scard_call_context* smartcard, static LONG smartcard_LocateCardsA_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - UINT32 x; - LONG status; + UINT32 x = 0; + LONG status = 0; LocateCards_Return ret = { 0 }; - LocateCardsA_Call* call; + LocateCardsA_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(operation); @@ -638,10 +638,10 @@ static LONG smartcard_LocateCardsA_Call(scard_call_context* smartcard, wStream* static LONG smartcard_LocateCardsW_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - UINT32 x; - LONG status; + UINT32 x = 0; + LONG status = 0; LocateCards_Return ret = { 0 }; - LocateCardsW_Call* call; + LocateCardsW_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(operation); @@ -682,10 +682,10 @@ static LONG smartcard_LocateCardsW_Call(scard_call_context* smartcard, wStream* static LONG smartcard_ReadCacheA_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; - BOOL autoalloc; + LONG status = 0; + BOOL autoalloc = 0; ReadCache_Return ret = { 0 }; - ReadCacheA_Call* call; + ReadCacheA_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -733,9 +733,9 @@ static LONG smartcard_ReadCacheA_Call(scard_call_context* smartcard, wStream* ou static LONG smartcard_ReadCacheW_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; ReadCache_Return ret = { 0 }; - ReadCacheW_Call* call; + ReadCacheW_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -770,7 +770,7 @@ static LONG smartcard_WriteCacheA_Call(scard_call_context* smartcard, wStream* o SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - WriteCacheA_Call* call; + WriteCacheA_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -790,7 +790,7 @@ static LONG smartcard_WriteCacheW_Call(scard_call_context* smartcard, wStream* o SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - WriteCacheW_Call* call; + WriteCacheW_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -809,7 +809,7 @@ static LONG smartcard_WriteCacheW_Call(scard_call_context* smartcard, wStream* o static LONG smartcard_GetTransmitCount_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; GetTransmitCount_Return ret = { 0 }; WINPR_ASSERT(smartcard); @@ -840,9 +840,9 @@ static LONG smartcard_ReleaseStartedEvent_Call(scard_call_context* smartcard, wS static LONG smartcard_GetReaderIcon_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; GetReaderIcon_Return ret = { 0 }; - GetReaderIcon_Call* call; + GetReaderIcon_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -866,9 +866,9 @@ static LONG smartcard_GetReaderIcon_Call(scard_call_context* smartcard, wStream* static LONG smartcard_GetDeviceTypeId_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; GetDeviceTypeId_Return ret = { 0 }; - GetDeviceTypeId_Call* call; + GetDeviceTypeId_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -891,12 +891,12 @@ static LONG smartcard_GetStatusChangeA_Call(scard_call_context* smartcard, wStre SMARTCARD_OPERATION* operation) { LONG status = STATUS_NO_MEMORY; - UINT32 index; - DWORD dwTimeOut; - DWORD x; + UINT32 index = 0; + DWORD dwTimeOut = 0; + DWORD x = 0; const DWORD dwTimeStep = 100; GetStatusChange_Return ret = { 0 }; - GetStatusChangeA_Call* call; + GetStatusChangeA_Call* call = NULL; LPSCARD_READERSTATEA rgReaderStates = NULL; WINPR_ASSERT(smartcard); @@ -955,12 +955,12 @@ static LONG smartcard_GetStatusChangeW_Call(scard_call_context* smartcard, wStre SMARTCARD_OPERATION* operation) { LONG status = STATUS_NO_MEMORY; - UINT32 index; - DWORD dwTimeOut; - DWORD x; + UINT32 index = 0; + DWORD dwTimeOut = 0; + DWORD x = 0; const DWORD dwTimeStep = 100; GetStatusChange_Return ret = { 0 }; - GetStatusChangeW_Call* call; + GetStatusChangeW_Call* call = NULL; LPSCARD_READERSTATEW rgReaderStates = NULL; WINPR_ASSERT(smartcard); @@ -1035,10 +1035,10 @@ static LONG smartcard_Cancel_Call(scard_call_context* smartcard, wStream* out, static LONG smartcard_ConnectA_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; SCARDHANDLE hCard = 0; Connect_Return ret = { 0 }; - ConnectA_Call* call; + ConnectA_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1071,10 +1071,10 @@ out_fail: static LONG smartcard_ConnectW_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; SCARDHANDLE hCard = 0; Connect_Return ret = { 0 }; - ConnectW_Call* call; + ConnectW_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1107,9 +1107,9 @@ out_fail: static LONG smartcard_Reconnect_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; Reconnect_Return ret = { 0 }; - Reconnect_Call* call; + Reconnect_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1131,7 +1131,7 @@ static LONG smartcard_Disconnect_Call(scard_call_context* smartcard, wStream* ou SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - HCardAndDisposition_Call* call; + HCardAndDisposition_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1165,7 +1165,7 @@ static LONG smartcard_EndTransaction_Call(scard_call_context* smartcard, wStream SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - HCardAndDisposition_Call* call; + HCardAndDisposition_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1182,7 +1182,7 @@ static LONG smartcard_EndTransaction_Call(scard_call_context* smartcard, wStream static LONG smartcard_State_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; State_Return ret = { 0 }; WINPR_ASSERT(smartcard); @@ -1204,12 +1204,12 @@ static LONG smartcard_State_Call(scard_call_context* smartcard, wStream* out, static LONG smartcard_StatusA_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; Status_Return ret = { 0 }; DWORD cchReaderLen = 0; DWORD cbAtrLen = 0; LPSTR mszReaderNames = NULL; - Status_Call* call; + Status_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1255,11 +1255,11 @@ static LONG smartcard_StatusA_Call(scard_call_context* smartcard, wStream* out, static LONG smartcard_StatusW_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; Status_Return ret = { 0 }; LPWSTR mszReaderNames = NULL; - Status_Call* call; - DWORD cbAtrLen; + Status_Call* call = NULL; + DWORD cbAtrLen = 0; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1307,9 +1307,9 @@ static LONG smartcard_StatusW_Call(scard_call_context* smartcard, wStream* out, static LONG smartcard_Transmit_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; Transmit_Return ret = { 0 }; - Transmit_Call* call; + Transmit_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1349,9 +1349,9 @@ static LONG smartcard_Transmit_Call(scard_call_context* smartcard, wStream* out, static LONG smartcard_Control_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; Control_Return ret = { 0 }; - Control_Call* call; + Control_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1380,11 +1380,11 @@ static LONG smartcard_GetAttrib_Call(scard_call_context* smartcard, wStream* out SMARTCARD_OPERATION* operation) { BOOL autoAllocate = FALSE; - LONG status; + LONG status = 0; DWORD cbAttrLen = 0; LPBYTE pbAttr = NULL; GetAttrib_Return ret = { 0 }; - const GetAttrib_Call* call; + const GetAttrib_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(operation); @@ -1424,7 +1424,7 @@ static LONG smartcard_SetAttrib_Call(scard_call_context* smartcard, wStream* out SMARTCARD_OPERATION* operation) { Long_Return ret = { 0 }; - SetAttrib_Call* call; + SetAttrib_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1461,14 +1461,14 @@ static LONG smartcard_AccessStartedEvent_Call(scard_call_context* smartcard, wSt static LONG smartcard_LocateCardsByATRA_Call(scard_call_context* smartcard, wStream* out, SMARTCARD_OPERATION* operation) { - LONG status; - DWORD i; - DWORD j; - DWORD k; + LONG status = 0; + DWORD i = 0; + DWORD j = 0; + DWORD k = 0; GetStatusChange_Return ret = { 0 }; LPSCARD_READERSTATEA state = NULL; LPSCARD_READERSTATEA states = NULL; - LocateCardsByATRA_Call* call; + LocateCardsByATRA_Call* call = NULL; WINPR_ASSERT(smartcard); WINPR_ASSERT(operation); @@ -1544,11 +1544,11 @@ static LONG smartcard_LocateCardsByATRA_Call(scard_call_context* smartcard, wStr LONG smartcard_irp_device_control_call(scard_call_context* smartcard, wStream* out, UINT32* pIoStatus, SMARTCARD_OPERATION* operation) { - LONG result; - UINT32 offset; - UINT32 ioControlCode; - size_t outputBufferLength; - size_t objectBufferLength; + LONG result = 0; + UINT32 offset = 0; + UINT32 ioControlCode = 0; + size_t outputBufferLength = 0; + size_t objectBufferLength = 0; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1836,8 +1836,8 @@ static void context_free(void* arg) scard_call_context* smartcard_call_context_new(const rdpSettings* settings) { - wObject* obj; - scard_call_context* ctx; + wObject* obj = NULL; + scard_call_context* ctx = NULL; WINPR_ASSERT(settings); ctx = calloc(1, sizeof(scard_call_context)); @@ -1995,7 +1995,7 @@ BOOL smarcard_call_set_callbacks(scard_call_context* ctx, void* userdata, void* smartcard_call_get_context(scard_call_context* ctx, SCARDCONTEXT hContext) { - struct s_scard_context_element* element; + struct s_scard_context_element* element = NULL; WINPR_ASSERT(ctx); element = HashTable_GetItemValue(ctx->rgSCardContextList, (void*)hContext); diff --git a/libfreerdp/utils/smartcard_operations.c b/libfreerdp/utils/smartcard_operations.c index c5a965213..7aad8539f 100644 --- a/libfreerdp/utils/smartcard_operations.c +++ b/libfreerdp/utils/smartcard_operations.c @@ -57,7 +57,7 @@ static LONG smartcard_call_to_operation_handle(SMARTCARD_OPERATION* operation) static LONG smartcard_EstablishContext_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -73,7 +73,7 @@ static LONG smartcard_EstablishContext_Decode(wStream* s, SMARTCARD_OPERATION* o static LONG smartcard_ReleaseContext_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -87,7 +87,7 @@ static LONG smartcard_ReleaseContext_Decode(wStream* s, SMARTCARD_OPERATION* ope static LONG smartcard_IsValidContext_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -99,7 +99,7 @@ static LONG smartcard_IsValidContext_Decode(wStream* s, SMARTCARD_OPERATION* ope static LONG smartcard_ListReaderGroupsA_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -111,7 +111,7 @@ static LONG smartcard_ListReaderGroupsA_Decode(wStream* s, SMARTCARD_OPERATION* static LONG smartcard_ListReaderGroupsW_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -123,7 +123,7 @@ static LONG smartcard_ListReaderGroupsW_Decode(wStream* s, SMARTCARD_OPERATION* static LONG smartcard_ListReadersA_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -135,7 +135,7 @@ static LONG smartcard_ListReadersA_Decode(wStream* s, SMARTCARD_OPERATION* opera static LONG smartcard_ListReadersW_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -147,7 +147,7 @@ static LONG smartcard_ListReadersW_Decode(wStream* s, SMARTCARD_OPERATION* opera static LONG smartcard_context_and_two_strings_a_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -160,7 +160,7 @@ static LONG smartcard_context_and_two_strings_a_Decode(wStream* s, SMARTCARD_OPE static LONG smartcard_context_and_two_strings_w_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -173,7 +173,7 @@ static LONG smartcard_context_and_two_strings_w_Decode(wStream* s, SMARTCARD_OPE static LONG smartcard_context_and_string_a_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -185,7 +185,7 @@ static LONG smartcard_context_and_string_a_Decode(wStream* s, SMARTCARD_OPERATIO static LONG smartcard_context_and_string_w_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -197,7 +197,7 @@ static LONG smartcard_context_and_string_w_Decode(wStream* s, SMARTCARD_OPERATIO static LONG smartcard_LocateCardsA_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -209,7 +209,7 @@ static LONG smartcard_LocateCardsA_Decode(wStream* s, SMARTCARD_OPERATION* opera static LONG smartcard_LocateCardsW_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -221,7 +221,7 @@ static LONG smartcard_LocateCardsW_Decode(wStream* s, SMARTCARD_OPERATION* opera static LONG smartcard_GetStatusChangeA_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -233,7 +233,7 @@ static LONG smartcard_GetStatusChangeA_Decode(wStream* s, SMARTCARD_OPERATION* o static LONG smartcard_GetStatusChangeW_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -245,7 +245,7 @@ static LONG smartcard_GetStatusChangeW_Decode(wStream* s, SMARTCARD_OPERATION* o static LONG smartcard_Cancel_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -257,7 +257,7 @@ static LONG smartcard_Cancel_Decode(wStream* s, SMARTCARD_OPERATION* operation) static LONG smartcard_ConnectA_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -269,7 +269,7 @@ static LONG smartcard_ConnectA_Decode(wStream* s, SMARTCARD_OPERATION* operation static LONG smartcard_ConnectW_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -281,7 +281,7 @@ static LONG smartcard_ConnectW_Decode(wStream* s, SMARTCARD_OPERATION* operation static LONG smartcard_Reconnect_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -293,7 +293,7 @@ static LONG smartcard_Reconnect_Decode(wStream* s, SMARTCARD_OPERATION* operatio static LONG smartcard_Disconnect_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -306,7 +306,7 @@ static LONG smartcard_Disconnect_Decode(wStream* s, SMARTCARD_OPERATION* operati static LONG smartcard_BeginTransaction_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -319,7 +319,7 @@ static LONG smartcard_BeginTransaction_Decode(wStream* s, SMARTCARD_OPERATION* o static LONG smartcard_EndTransaction_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -332,7 +332,7 @@ static LONG smartcard_EndTransaction_Decode(wStream* s, SMARTCARD_OPERATION* ope static LONG smartcard_State_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -344,7 +344,7 @@ static LONG smartcard_State_Decode(wStream* s, SMARTCARD_OPERATION* operation) static LONG smartcard_StatusA_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -356,7 +356,7 @@ static LONG smartcard_StatusA_Decode(wStream* s, SMARTCARD_OPERATION* operation) static LONG smartcard_StatusW_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -368,7 +368,7 @@ static LONG smartcard_StatusW_Decode(wStream* s, SMARTCARD_OPERATION* operation) static LONG smartcard_Transmit_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -380,7 +380,7 @@ static LONG smartcard_Transmit_Decode(wStream* s, SMARTCARD_OPERATION* operation static LONG smartcard_Control_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -392,7 +392,7 @@ static LONG smartcard_Control_Decode(wStream* s, SMARTCARD_OPERATION* operation) static LONG smartcard_GetAttrib_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -404,7 +404,7 @@ static LONG smartcard_GetAttrib_Decode(wStream* s, SMARTCARD_OPERATION* operatio static LONG smartcard_SetAttrib_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -429,7 +429,7 @@ static LONG smartcard_AccessStartedEvent_Decode(wStream* s, SMARTCARD_OPERATION* static LONG smartcard_LocateCardsByATRA_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -441,7 +441,7 @@ static LONG smartcard_LocateCardsByATRA_Decode(wStream* s, SMARTCARD_OPERATION* static LONG smartcard_LocateCardsByATRW_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -453,7 +453,7 @@ static LONG smartcard_LocateCardsByATRW_Decode(wStream* s, SMARTCARD_OPERATION* static LONG smartcard_ReadCacheA_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -465,7 +465,7 @@ static LONG smartcard_ReadCacheA_Decode(wStream* s, SMARTCARD_OPERATION* operati static LONG smartcard_ReadCacheW_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -477,7 +477,7 @@ static LONG smartcard_ReadCacheW_Decode(wStream* s, SMARTCARD_OPERATION* operati static LONG smartcard_WriteCacheA_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -489,7 +489,7 @@ static LONG smartcard_WriteCacheA_Decode(wStream* s, SMARTCARD_OPERATION* operat static LONG smartcard_WriteCacheW_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -501,7 +501,7 @@ static LONG smartcard_WriteCacheW_Decode(wStream* s, SMARTCARD_OPERATION* operat static LONG smartcard_GetTransmitCount_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -522,7 +522,7 @@ static LONG smartcard_ReleaseStartedEvent_Decode(wStream* s, SMARTCARD_OPERATION static LONG smartcard_GetReaderIcon_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -534,7 +534,7 @@ static LONG smartcard_GetReaderIcon_Decode(wStream* s, SMARTCARD_OPERATION* oper static LONG smartcard_GetDeviceTypeId_Decode(wStream* s, SMARTCARD_OPERATION* operation) { - LONG status; + LONG status = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -547,11 +547,11 @@ static LONG smartcard_GetDeviceTypeId_Decode(wStream* s, SMARTCARD_OPERATION* op LONG smartcard_irp_device_control_decode(wStream* s, UINT32 CompletionId, UINT32 FileId, SMARTCARD_OPERATION* operation) { - LONG status; - UINT32 offset; - UINT32 ioControlCode; - UINT32 outputBufferLength; - UINT32 inputBufferLength; + LONG status = 0; + UINT32 offset = 0; + UINT32 ioControlCode = 0; + UINT32 outputBufferLength = 0; + UINT32 inputBufferLength = 0; WINPR_ASSERT(s); WINPR_ASSERT(operation); @@ -801,7 +801,7 @@ LONG smartcard_irp_device_control_decode(wStream* s, UINT32 CompletionId, UINT32 if (Stream_GetPosition(s) < Stream_Length(s)) { - SIZE_T difference; + SIZE_T difference = 0; difference = Stream_Length(s) - Stream_GetPosition(s); WLog_WARN(TAG, "IRP was not fully parsed %s (%s [0x%08" PRIX32 "]): Actual: %" PRIuz @@ -814,7 +814,7 @@ LONG smartcard_irp_device_control_decode(wStream* s, UINT32 CompletionId, UINT32 if (Stream_GetPosition(s) > Stream_Length(s)) { - SIZE_T difference; + SIZE_T difference = 0; difference = Stream_GetPosition(s) - Stream_Length(s); WLog_WARN(TAG, "IRP was parsed beyond its end %s (0x%08" PRIX32 "): Actual: %" PRIuz @@ -828,7 +828,7 @@ LONG smartcard_irp_device_control_decode(wStream* s, UINT32 CompletionId, UINT32 static void free_reader_states_a(LPSCARD_READERSTATEA rgReaderStates, UINT32 cReaders) { - UINT32 x; + UINT32 x = 0; for (x = 0; x < cReaders; x++) { SCARD_READERSTATEA* state = &rgReaderStates[x]; @@ -840,7 +840,7 @@ static void free_reader_states_a(LPSCARD_READERSTATEA rgReaderStates, UINT32 cRe static void free_reader_states_w(LPSCARD_READERSTATEW rgReaderStates, UINT32 cReaders) { - UINT32 x; + UINT32 x = 0; for (x = 0; x < cReaders; x++) { SCARD_READERSTATEW* state = &rgReaderStates[x]; diff --git a/libfreerdp/utils/smartcard_pack.c b/libfreerdp/utils/smartcard_pack.c index 284c02aee..03ae82217 100644 --- a/libfreerdp/utils/smartcard_pack.c +++ b/libfreerdp/utils/smartcard_pack.c @@ -72,7 +72,7 @@ static BOOL smartcard_ndr_pointer_read_(wStream* s, UINT32* index, UINT32* ptr, const char* fkt, size_t line) { const UINT32 expect = 0x20000 + (*index) * 4; - UINT32 ndrPtr; + UINT32 ndrPtr = 0; WINPR_UNUSED(file); if (!s) return FALSE; @@ -101,9 +101,9 @@ static LONG smartcard_ndr_read(wStream* s, BYTE** data, size_t min, size_t eleme ndr_ptr_t type) { size_t len = 0; - size_t offset; - size_t len2; - void* r; + size_t offset = 0; + size_t len2 = 0; + void* r = NULL; size_t required = 0; switch (type) @@ -203,7 +203,7 @@ static LONG smartcard_ndr_write(wStream* s, const BYTE* data, UINT32 size, UINT3 const UINT32 offset = 0; const UINT32 len = size; const UINT32 dataLen = size * elementSize; - size_t required; + size_t required = 0; if (size == 0) return SCARD_S_SUCCESS; @@ -327,7 +327,7 @@ static LONG smartcard_ndr_read_u(wStream* s, UUID** data) static char* smartcard_convert_string_list(const void* in, size_t bytes, BOOL unicode) { - size_t index; + size_t index = 0; size_t length = 0; union { @@ -409,8 +409,8 @@ static char* smartcard_msz_dump_w(const WCHAR* msz, size_t len, char* buffer, si static char* smartcard_array_dump(const void* pd, size_t len, char* buffer, size_t bufferLen) { const BYTE* data = pd; - size_t x; - int rc; + size_t x = 0; + int rc = 0; char* start = buffer; /* Ensure '\0' termination */ @@ -517,9 +517,9 @@ static void smartcard_trace_list_reader_groups_call(const ListReaderGroups_Call* static void smartcard_trace_get_status_change_w_call(const GetStatusChangeW_Call* call) { - UINT32 index; - char* szEventState; - char* szCurrentState; + UINT32 index = 0; + char* szEventState = NULL; + char* szCurrentState = NULL; if (!WLog_IsLevelActive(WLog_Get(TAG), g_LogLevel)) return; @@ -593,9 +593,9 @@ static void smartcard_trace_list_readers_call(const ListReaders_Call* call, BOOL static void smartcard_trace_locate_cards_by_atr_a_call(const LocateCardsByATRA_Call* call) { - UINT32 index; - char* szEventState; - char* szCurrentState; + UINT32 index = 0; + char* szEventState = NULL; + char* szCurrentState = NULL; if (!WLog_IsLevelActive(WLog_Get(TAG), g_LogLevel)) return; @@ -758,9 +758,9 @@ static void smartcard_trace_list_readers_return(const ListReaders_Return* ret, B static void smartcard_trace_get_status_change_return(const GetStatusChange_Return* ret, BOOL unicode) { - UINT32 index; - char* szEventState; - char* szCurrentState; + UINT32 index = 0; + char* szEventState = NULL; + char* szCurrentState = NULL; if (!WLog_IsLevelActive(WLog_Get(TAG), g_LogLevel)) return; @@ -930,8 +930,8 @@ static void smartcard_trace_read_cache_w_call(const ReadCacheW_Call* call) static void smartcard_trace_transmit_call(const Transmit_Call* call) { - UINT32 cbExtraBytes; - BYTE* pbExtraBytes; + UINT32 cbExtraBytes = 0; + BYTE* pbExtraBytes = NULL; if (!WLog_IsLevelActive(WLog_Get(TAG), g_LogLevel)) return; @@ -999,9 +999,9 @@ static void smartcard_trace_transmit_call(const Transmit_Call* call) static void smartcard_trace_locate_cards_by_atr_w_call(const LocateCardsByATRW_Call* call) { - UINT32 index; - char* szEventState; - char* szCurrentState; + UINT32 index = 0; + char* szEventState = NULL; + char* szCurrentState = NULL; if (!WLog_IsLevelActive(WLog_Get(TAG), g_LogLevel)) return; @@ -1040,8 +1040,8 @@ static void smartcard_trace_locate_cards_by_atr_w_call(const LocateCardsByATRW_C static void smartcard_trace_transmit_return(const Transmit_Return* ret) { - UINT32 cbExtraBytes; - BYTE* pbExtraBytes; + UINT32 cbExtraBytes = 0; + BYTE* pbExtraBytes = NULL; if (!WLog_IsLevelActive(WLog_Get(TAG), g_LogLevel)) return; @@ -1224,7 +1224,7 @@ static void smartcard_trace_status_return(const Status_Return* ret, BOOL unicode { char* mszReaderNamesA = NULL; char buffer[1024]; - DWORD cBytes; + DWORD cBytes = 0; if (!WLog_IsLevelActive(WLog_Get(TAG), g_LogLevel)) return; @@ -1254,7 +1254,7 @@ static void smartcard_trace_status_return(const Status_Return* ret, BOOL unicode static void smartcard_trace_state_return(const State_Return* ret) { char buffer[1024]; - char* state; + char* state = NULL; if (!WLog_IsLevelActive(WLog_Get(TAG), g_LogLevel)) return; @@ -1476,10 +1476,10 @@ static LONG smartcard_unpack_common_context_and_string_w(wStream* s, REDIR_SCARD LONG smartcard_unpack_common_type_header(wStream* s) { - UINT8 version; - UINT32 filler; - UINT8 endianness; - UINT16 commonHeaderLength; + UINT8 version = 0; + UINT32 filler = 0; + UINT8 endianness = 0; + UINT16 commonHeaderLength = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) return STATUS_BUFFER_TOO_SMALL; @@ -1528,8 +1528,8 @@ void smartcard_pack_common_type_header(wStream* s) LONG smartcard_unpack_private_type_header(wStream* s) { - UINT32 filler; - UINT32 objectBufferLength; + UINT32 filler = 0; + UINT32 objectBufferLength = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) return STATUS_BUFFER_TOO_SMALL; @@ -1557,7 +1557,7 @@ void smartcard_pack_private_type_header(wStream* s, UINT32 objectBufferLength) LONG smartcard_unpack_read_size_align(wStream* s, size_t size, UINT32 alignment) { - size_t pad; + size_t pad = 0; pad = size; size = (size + alignment - 1) & ~(alignment - 1); @@ -1571,7 +1571,7 @@ LONG smartcard_unpack_read_size_align(wStream* s, size_t size, UINT32 alignment) LONG smartcard_pack_write_size_align(wStream* s, size_t size, UINT32 alignment) { - size_t pad; + size_t pad = 0; pad = size; size = (size + alignment - 1) & ~(alignment - 1); @@ -1652,7 +1652,7 @@ LONG smartcard_unpack_redir_scard_context_(wStream* s, REDIR_SCARDCONTEXT* conte UINT32* ppbContextNdrPtr, const char* file, const char* function, int line) { - UINT32 pbContextNdrPtr; + UINT32 pbContextNdrPtr = 0; WINPR_UNUSED(file); WINPR_ASSERT(context); @@ -1713,7 +1713,7 @@ LONG smartcard_pack_redir_scard_context(wStream* s, const REDIR_SCARDCONTEXT* co LONG smartcard_unpack_redir_scard_context_ref(wStream* s, UINT32 pbContextNdrPtr, REDIR_SCARDCONTEXT* context) { - UINT32 length; + UINT32 length = 0; WINPR_ASSERT(context); if (context->cbContext == 0) @@ -1798,7 +1798,7 @@ LONG smartcard_pack_redir_scard_handle(wStream* s, const REDIR_SCARDHANDLE* hand LONG smartcard_unpack_redir_scard_handle_ref(wStream* s, REDIR_SCARDHANDLE* handle) { - UINT32 length; + UINT32 length = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) return STATUS_BUFFER_TOO_SMALL; @@ -1850,7 +1850,7 @@ LONG smartcard_unpack_establish_context_call(wStream* s, EstablishContext_Call* LONG smartcard_pack_establish_context_return(wStream* s, const EstablishContext_Return* ret) { - LONG status; + LONG status = 0; DWORD index = 0; smartcard_trace_establish_context_return(ret); @@ -1911,7 +1911,7 @@ LONG smartcard_unpack_list_reader_groups_call(wStream* s, ListReaderGroups_Call* LONG smartcard_pack_list_reader_groups_return(wStream* s, const ListReaderGroups_Return* ret, BOOL unicode) { - LONG status; + LONG status = 0; DWORD cBytes = ret->cBytes; UINT32 index = 0; @@ -1937,7 +1937,7 @@ LONG smartcard_pack_list_reader_groups_return(wStream* s, const ListReaderGroups LONG smartcard_unpack_list_readers_call(wStream* s, ListReaders_Call* call, BOOL unicode) { UINT32 index = 0; - UINT32 mszGroupsNdrPtr; + UINT32 mszGroupsNdrPtr = 0; UINT32 pbContextNdrPtr = 0; call->mszGroups = NULL; @@ -1973,7 +1973,7 @@ LONG smartcard_unpack_list_readers_call(wStream* s, ListReaders_Call* call, BOOL LONG smartcard_pack_list_readers_return(wStream* s, const ListReaders_Return* ret, BOOL unicode) { - LONG status; + LONG status = 0; UINT32 index = 0; UINT32 size = ret->cBytes; @@ -2015,7 +2015,7 @@ static LONG smartcard_unpack_connect_common(wStream* s, Connect_Common_Call* com LONG smartcard_unpack_connect_a_call(wStream* s, ConnectA_Call* call) { - LONG status; + LONG status = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; call->szReader = NULL; @@ -2044,7 +2044,7 @@ LONG smartcard_unpack_connect_a_call(wStream* s, ConnectA_Call* call) LONG smartcard_unpack_connect_w_call(wStream* s, ConnectW_Call* call) { - LONG status; + LONG status = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; @@ -2074,7 +2074,7 @@ LONG smartcard_unpack_connect_w_call(wStream* s, ConnectW_Call* call) LONG smartcard_pack_connect_return(wStream* s, const Connect_Return* ret) { - LONG status; + LONG status = 0; DWORD index = 0; smartcard_trace_connect_return(ret); @@ -2176,10 +2176,10 @@ LONG smartcard_unpack_hcard_and_disposition_call(wStream* s, HCardAndDisposition static void smartcard_trace_get_status_change_a_call(const GetStatusChangeA_Call* call) { - UINT32 index; - char* szEventState; - char* szCurrentState; - LPSCARD_READERSTATEA readerState; + UINT32 index = 0; + char* szEventState = NULL; + char* szCurrentState = NULL; + LPSCARD_READERSTATEA readerState = NULL; if (!WLog_IsLevelActive(WLog_Get(TAG), g_LogLevel)) return; @@ -2211,11 +2211,11 @@ static void smartcard_trace_get_status_change_a_call(const GetStatusChangeA_Call static LONG smartcard_unpack_reader_state_a(wStream* s, LPSCARD_READERSTATEA* ppcReaders, UINT32 cReaders, UINT32* ptrIndex) { - UINT32 index; - UINT32 len; + UINT32 index = 0; + UINT32 len = 0; LONG status = SCARD_E_NO_MEMORY; - LPSCARD_READERSTATEA rgReaderStates; - BOOL* states; + LPSCARD_READERSTATEA rgReaderStates = NULL; + BOOL* states = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) return status; @@ -2285,11 +2285,11 @@ fail: static LONG smartcard_unpack_reader_state_w(wStream* s, LPSCARD_READERSTATEW* ppcReaders, UINT32 cReaders, UINT32* ptrIndex) { - UINT32 index; - UINT32 len; + UINT32 index = 0; + UINT32 len = 0; LONG status = SCARD_E_NO_MEMORY; - LPSCARD_READERSTATEW rgReaderStates; - BOOL* states; + LPSCARD_READERSTATEW rgReaderStates = NULL; + BOOL* states = NULL; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) return status; @@ -2365,7 +2365,7 @@ fail: LONG smartcard_unpack_get_status_change_a_call(wStream* s, GetStatusChangeA_Call* call) { - UINT32 ndrPtr; + UINT32 ndrPtr = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; @@ -2401,7 +2401,7 @@ LONG smartcard_unpack_get_status_change_a_call(wStream* s, GetStatusChangeA_Call LONG smartcard_unpack_get_status_change_w_call(wStream* s, GetStatusChangeW_Call* call) { - UINT32 ndrPtr; + UINT32 ndrPtr = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; @@ -2438,7 +2438,7 @@ LONG smartcard_unpack_get_status_change_w_call(wStream* s, GetStatusChangeW_Call LONG smartcard_pack_get_status_change_return(wStream* s, const GetStatusChange_Return* ret, BOOL unicode) { - LONG status; + LONG status = 0; DWORD cReaders = ret->cReaders; UINT32 index = 0; @@ -2491,7 +2491,7 @@ LONG smartcard_unpack_state_call(wStream* s, State_Call* call) LONG smartcard_pack_state_return(wStream* s, const State_Return* ret) { - LONG status; + LONG status = 0; DWORD cbAtrLen = ret->cbAtrLen; UINT32 index = 0; @@ -2546,7 +2546,7 @@ LONG smartcard_unpack_status_call(wStream* s, Status_Call* call, BOOL unicode) LONG smartcard_pack_status_return(wStream* s, const Status_Return* ret, BOOL unicode) { - LONG status; + LONG status = 0; UINT32 index = 0; DWORD cBytes = ret->cBytes; @@ -2611,8 +2611,8 @@ LONG smartcard_unpack_get_attrib_call(wStream* s, GetAttrib_Call* call) LONG smartcard_pack_get_attrib_return(wStream* s, const GetAttrib_Return* ret, DWORD dwAttrId, DWORD cbAttrCallLen) { - LONG status; - DWORD cbAttrLen; + LONG status = 0; + DWORD cbAttrLen = 0; UINT32 index = 0; smartcard_trace_get_attrib_return(ret, dwAttrId); @@ -2643,7 +2643,7 @@ LONG smartcard_pack_get_attrib_return(wStream* s, const GetAttrib_Return* ret, D LONG smartcard_unpack_control_call(wStream* s, Control_Call* call) { UINT32 index = 0; - UINT32 pvInBufferNdrPtr; + UINT32 pvInBufferNdrPtr = 0; UINT32 pbContextNdrPtr = 0; call->pvInBuffer = NULL; @@ -2687,7 +2687,7 @@ LONG smartcard_unpack_control_call(wStream* s, Control_Call* call) LONG smartcard_pack_control_return(wStream* s, const Control_Return* ret) { - LONG status; + LONG status = 0; DWORD cbDataLen = ret->cbOutBufferSize; UINT32 index = 0; @@ -2712,11 +2712,11 @@ LONG smartcard_pack_control_return(wStream* s, const Control_Return* ret) LONG smartcard_unpack_transmit_call(wStream* s, Transmit_Call* call) { - UINT32 length; - BYTE* pbExtraBytes; - UINT32 pbExtraBytesNdrPtr; - UINT32 pbSendBufferNdrPtr; - UINT32 pioRecvPciNdrPtr; + UINT32 length = 0; + BYTE* pbExtraBytes = NULL; + UINT32 pbExtraBytesNdrPtr = 0; + UINT32 pbSendBufferNdrPtr = 0; + UINT32 pioRecvPciNdrPtr = 0; SCardIO_Request ioSendPci; SCardIO_Request ioRecvPci; UINT32 index = 0; @@ -2918,9 +2918,9 @@ LONG smartcard_unpack_transmit_call(wStream* s, Transmit_Call* call) LONG smartcard_pack_transmit_return(wStream* s, const Transmit_Return* ret) { - LONG status; + LONG status = 0; UINT32 index = 0; - LONG error; + LONG error = 0; UINT32 cbRecvLength = ret->cbRecvLength; UINT32 cbRecvPci = ret->pioRecvPci ? ret->pioRecvPci->cbPciLength : 0; @@ -2965,8 +2965,8 @@ LONG smartcard_pack_transmit_return(wStream* s, const Transmit_Return* ret) LONG smartcard_unpack_locate_cards_by_atr_a_call(wStream* s, LocateCardsByATRA_Call* call) { - UINT32 rgReaderStatesNdrPtr; - UINT32 rgAtrMasksNdrPtr; + UINT32 rgReaderStatesNdrPtr = 0; + UINT32 rgAtrMasksNdrPtr = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; @@ -3020,8 +3020,8 @@ LONG smartcard_unpack_locate_cards_by_atr_a_call(wStream* s, LocateCardsByATRA_C LONG smartcard_unpack_context_and_two_strings_a_call(wStream* s, ContextAndTwoStringA_Call* call) { - UINT32 sz1NdrPtr; - UINT32 sz2NdrPtr; + UINT32 sz1NdrPtr = 0; + UINT32 sz2NdrPtr = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; @@ -3057,8 +3057,8 @@ LONG smartcard_unpack_context_and_two_strings_a_call(wStream* s, ContextAndTwoSt LONG smartcard_unpack_context_and_two_strings_w_call(wStream* s, ContextAndTwoStringW_Call* call) { - UINT32 sz1NdrPtr; - UINT32 sz2NdrPtr; + UINT32 sz1NdrPtr = 0; + UINT32 sz2NdrPtr = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; @@ -3094,8 +3094,8 @@ LONG smartcard_unpack_context_and_two_strings_w_call(wStream* s, ContextAndTwoSt LONG smartcard_unpack_locate_cards_a_call(wStream* s, LocateCardsA_Call* call) { - UINT32 sz1NdrPtr; - UINT32 sz2NdrPtr; + UINT32 sz1NdrPtr = 0; + UINT32 sz2NdrPtr = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; @@ -3138,8 +3138,8 @@ LONG smartcard_unpack_locate_cards_a_call(wStream* s, LocateCardsA_Call* call) LONG smartcard_unpack_locate_cards_w_call(wStream* s, LocateCardsW_Call* call) { - UINT32 sz1NdrPtr; - UINT32 sz2NdrPtr; + UINT32 sz1NdrPtr = 0; + UINT32 sz2NdrPtr = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; @@ -3183,7 +3183,7 @@ LONG smartcard_unpack_locate_cards_w_call(wStream* s, LocateCardsW_Call* call) LONG smartcard_unpack_set_attrib_call(wStream* s, SetAttrib_Call* call) { UINT32 index = 0; - UINT32 ndrPtr; + UINT32 ndrPtr = 0; UINT32 pbContextNdrPtr = 0; LONG status = smartcard_unpack_redir_scard_context(s, &(call->handles.hContext), &index, @@ -3223,8 +3223,8 @@ LONG smartcard_unpack_set_attrib_call(wStream* s, SetAttrib_Call* call) LONG smartcard_unpack_locate_cards_by_atr_w_call(wStream* s, LocateCardsByATRW_Call* call) { - UINT32 rgReaderStatesNdrPtr; - UINT32 rgAtrMasksNdrPtr; + UINT32 rgReaderStatesNdrPtr = 0; + UINT32 rgAtrMasksNdrPtr = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; @@ -3279,8 +3279,8 @@ LONG smartcard_unpack_locate_cards_by_atr_w_call(wStream* s, LocateCardsByATRW_C LONG smartcard_unpack_read_cache_a_call(wStream* s, ReadCacheA_Call* call) { - UINT32 mszNdrPtr; - UINT32 contextNdrPtr; + UINT32 mszNdrPtr = 0; + UINT32 contextNdrPtr = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; @@ -3326,8 +3326,8 @@ LONG smartcard_unpack_read_cache_a_call(wStream* s, ReadCacheA_Call* call) LONG smartcard_unpack_read_cache_w_call(wStream* s, ReadCacheW_Call* call) { - UINT32 mszNdrPtr; - UINT32 contextNdrPtr; + UINT32 mszNdrPtr = 0; + UINT32 contextNdrPtr = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; @@ -3373,9 +3373,9 @@ LONG smartcard_unpack_read_cache_w_call(wStream* s, ReadCacheW_Call* call) LONG smartcard_unpack_write_cache_a_call(wStream* s, WriteCacheA_Call* call) { - UINT32 mszNdrPtr; - UINT32 contextNdrPtr; - UINT32 pbDataNdrPtr; + UINT32 mszNdrPtr = 0; + UINT32 contextNdrPtr = 0; + UINT32 pbDataNdrPtr = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; @@ -3434,9 +3434,9 @@ LONG smartcard_unpack_write_cache_a_call(wStream* s, WriteCacheA_Call* call) LONG smartcard_unpack_write_cache_w_call(wStream* s, WriteCacheW_Call* call) { - UINT32 mszNdrPtr; - UINT32 contextNdrPtr; - UINT32 pbDataNdrPtr; + UINT32 mszNdrPtr = 0; + UINT32 contextNdrPtr = 0; + UINT32 pbDataNdrPtr = 0; UINT32 index = 0; UINT32 pbContextNdrPtr = 0; @@ -3561,7 +3561,7 @@ LONG smartcard_pack_device_type_id_return(wStream* s, const GetDeviceTypeId_Retu LONG smartcard_pack_locate_cards_return(wStream* s, const LocateCards_Return* ret) { - LONG status; + LONG status = 0; DWORD cbDataLen = ret->cReaders; UINT32 index = 0; @@ -3589,7 +3589,7 @@ LONG smartcard_pack_locate_cards_return(wStream* s, const LocateCards_Return* re LONG smartcard_pack_get_reader_icon_return(wStream* s, const GetReaderIcon_Return* ret) { - LONG status; + LONG status = 0; UINT32 index = 0; DWORD cbDataLen = ret->cbDataLen; smartcard_trace_get_reader_icon_return(ret); @@ -3631,7 +3631,7 @@ LONG smartcard_pack_get_transmit_count_return(wStream* s, const GetTransmitCount LONG smartcard_pack_read_cache_return(wStream* s, const ReadCache_Return* ret) { - LONG status; + LONG status = 0; UINT32 index = 0; DWORD cbDataLen = ret->cbDataLen; smartcard_trace_read_cache_return(ret); diff --git a/libfreerdp/utils/stopwatch.c b/libfreerdp/utils/stopwatch.c index 10a2079aa..39896385d 100644 --- a/libfreerdp/utils/stopwatch.c +++ b/libfreerdp/utils/stopwatch.c @@ -45,7 +45,7 @@ static void stopwatch_set_time(UINT64* usecs) STOPWATCH* stopwatch_create(void) { - STOPWATCH* sw; + STOPWATCH* sw = NULL; #ifdef _WIN32 if (stopwatch_freq.QuadPart == 0) { diff --git a/libfreerdp/utils/string.c b/libfreerdp/utils/string.c index 0fda6758c..e67f3880d 100644 --- a/libfreerdp/utils/string.c +++ b/libfreerdp/utils/string.c @@ -24,7 +24,7 @@ char* rdp_redirection_flags_to_string(UINT32 flags, char* buffer, size_t size) { - size_t x; + size_t x = 0; struct map_t { UINT32 flag; diff --git a/libfreerdp/utils/test/TestPodArrays.c b/libfreerdp/utils/test/TestPodArrays.c index fc8794cec..0c178c474 100644 --- a/libfreerdp/utils/test/TestPodArrays.c +++ b/libfreerdp/utils/test/TestPodArrays.c @@ -60,12 +60,12 @@ POD_ARRAYS_IMPL(BasicStruct, basicstruct) int TestPodArrays(int argc, char* argv[]) { - UINT32 i; - UINT32 sum; - UINT32 foreach_index; + UINT32 i = 0; + UINT32 sum = 0; + UINT32 foreach_index = 0; ArrayUINT32 uint32s; - UINT32* ptr; - const UINT32* cptr; + UINT32* ptr = NULL; + const UINT32* cptr = NULL; ArrayBasicStruct basicStructs; BasicStruct basicStruct = { 1, 2 }; diff --git a/libfreerdp/utils/test/TestRingBuffer.c b/libfreerdp/utils/test/TestRingBuffer.c index e2950947c..a24612e06 100644 --- a/libfreerdp/utils/test/TestRingBuffer.c +++ b/libfreerdp/utils/test/TestRingBuffer.c @@ -27,11 +27,11 @@ static BOOL test_overlaps(void) RingBuffer rb; DataChunk chunks[2]; BYTE bytes[200]; - size_t i; - size_t k; - int x; - int nchunks; - int j; + size_t i = 0; + size_t k = 0; + int x = 0; + int nchunks = 0; + int j = 0; int counter = 0; for (i = 0; i < sizeof(bytes); i++) @@ -86,9 +86,9 @@ int TestRingBuffer(int argc, char* argv[]) { RingBuffer ringBuffer; int testNo = 0; - BYTE* tmpBuf; - BYTE* rb_ptr; - int i /*, chunkNb, counter*/; + BYTE* tmpBuf = NULL; + BYTE* rb_ptr = NULL; + int i = 0 /*, chunkNb, counter*/; DataChunk chunks[2]; WINPR_UNUSED(argc); diff --git a/rdtk/librdtk/rdtk_button.c b/rdtk/librdtk/rdtk_button.c index 797193794..815032e9c 100644 --- a/rdtk/librdtk/rdtk_button.c +++ b/rdtk/librdtk/rdtk_button.c @@ -27,12 +27,12 @@ int rdtk_button_draw(rdtkSurface* surface, uint16_t nXDst, uint16_t nYDst, uint16_t nWidth, uint16_t nHeight, rdtkButton* button, const char* text) { - uint16_t offsetX; - uint16_t offsetY; - uint16_t textWidth; - uint16_t textHeight; - uint16_t fillWidth; - uint16_t fillHeight; + uint16_t offsetX = 0; + uint16_t offsetY = 0; + uint16_t textWidth = 0; + uint16_t textHeight = 0; + uint16_t fillWidth = 0; + uint16_t fillHeight = 0; WINPR_ASSERT(surface); WINPR_ASSERT(button); diff --git a/rdtk/librdtk/rdtk_font.c b/rdtk/librdtk/rdtk_font.c index 2e250e3a8..ccd8f461a 100644 --- a/rdtk/librdtk/rdtk_font.c +++ b/rdtk/librdtk/rdtk_font.c @@ -655,8 +655,8 @@ static rdtkFont* rdtk_embedded_font_new(rdtkEngine* engine, const uint8_t* image size_t imageSize, const uint8_t* descriptorData, size_t descriptorSize) { - size_t size; - uint8_t* buffer; + size_t size = 0; + uint8_t* buffer = NULL; WINPR_ASSERT(engine); diff --git a/rdtk/librdtk/rdtk_label.c b/rdtk/librdtk/rdtk_label.c index b49a29918..298bf1711 100644 --- a/rdtk/librdtk/rdtk_label.c +++ b/rdtk/librdtk/rdtk_label.c @@ -28,10 +28,10 @@ int rdtk_label_draw(rdtkSurface* surface, uint16_t nXDst, uint16_t nYDst, uint16 uint16_t nHeight, rdtkLabel* label, const char* text, uint16_t hAlign, uint16_t vAlign) { - uint16_t offsetX; - uint16_t offsetY; - uint16_t textWidth; - uint16_t textHeight; + uint16_t offsetX = 0; + uint16_t offsetY = 0; + uint16_t textWidth = 0; + uint16_t textHeight = 0; WINPR_ASSERT(surface); diff --git a/rdtk/librdtk/rdtk_nine_patch.c b/rdtk/librdtk/rdtk_nine_patch.c index ea8432fb5..7cf5975cb 100644 --- a/rdtk/librdtk/rdtk_nine_patch.c +++ b/rdtk/librdtk/rdtk_nine_patch.c @@ -78,17 +78,17 @@ static int rdtk_image_copy_alpha_blend(uint8_t* pDstData, int nDstStep, int nXDs int rdtk_nine_patch_draw(rdtkSurface* surface, int nXDst, int nYDst, int nWidth, int nHeight, rdtkNinePatch* ninePatch) { - int x; - int y; - int width; - int height; - int nXSrc; - int nYSrc; - int nSrcStep; - int nDstStep; - uint8_t* pSrcData; - uint8_t* pDstData; - int scaleWidth; + int x = 0; + int y = 0; + int width = 0; + int height = 0; + int nXSrc = 0; + int nYSrc = 0; + int nSrcStep = 0; + int nDstStep = 0; + uint8_t* pSrcData = NULL; + uint8_t* pDstData = NULL; + int scaleWidth = 0; WINPR_ASSERT(surface); WINPR_ASSERT(ninePatch); @@ -448,16 +448,16 @@ void rdtk_nine_patch_free(rdtkNinePatch* ninePatch) int rdtk_nine_patch_engine_init(rdtkEngine* engine) { - int status; + int status = 0; wImage* image = NULL; - rdtkNinePatch* ninePatch; + rdtkNinePatch* ninePatch = NULL; WINPR_ASSERT(engine); if (!engine->button9patch) { - SSIZE_T size; - const uint8_t* data; + SSIZE_T size = 0; + const uint8_t* data = NULL; status = -1; size = rdtk_get_embedded_resource_file("btn_default_normal.9." FILE_EXT, &data); @@ -484,8 +484,8 @@ int rdtk_nine_patch_engine_init(rdtkEngine* engine) if (!engine->textField9patch) { - SSIZE_T size; - const uint8_t* data; + SSIZE_T size = 0; + const uint8_t* data = NULL; status = -1; size = rdtk_get_embedded_resource_file("textfield_default.9." FILE_EXT, &data); image = NULL; diff --git a/rdtk/librdtk/rdtk_text_field.c b/rdtk/librdtk/rdtk_text_field.c index a5823d377..7f2a82624 100644 --- a/rdtk/librdtk/rdtk_text_field.c +++ b/rdtk/librdtk/rdtk_text_field.c @@ -27,15 +27,15 @@ int rdtk_text_field_draw(rdtkSurface* surface, uint16_t nXDst, uint16_t nYDst, uint16_t nWidth, uint16_t nHeight, rdtkTextField* textField, const char* text) { - uint16_t offsetX; - uint16_t offsetY; - uint16_t textWidth; - uint16_t textHeight; - uint16_t fillWidth; - uint16_t fillHeight; - rdtkFont* font; - rdtkEngine* engine; - rdtkNinePatch* ninePatch; + uint16_t offsetX = 0; + uint16_t offsetY = 0; + uint16_t textWidth = 0; + uint16_t textHeight = 0; + uint16_t fillWidth = 0; + uint16_t fillHeight = 0; + rdtkFont* font = NULL; + rdtkEngine* engine = NULL; + rdtkNinePatch* ninePatch = NULL; WINPR_ASSERT(surface); WINPR_ASSERT(textField); diff --git a/rdtk/librdtk/test/TestRdTkNinePatch.c b/rdtk/librdtk/test/TestRdTkNinePatch.c index 99de4979e..2c7405f52 100644 --- a/rdtk/librdtk/test/TestRdTkNinePatch.c +++ b/rdtk/librdtk/test/TestRdTkNinePatch.c @@ -8,9 +8,9 @@ int TestRdTkNinePatch(int argc, char* argv[]) { rdtkEngine* engine = NULL; rdtkSurface* surface = NULL; - uint32_t scanline; - uint32_t width; - uint32_t height; + uint32_t scanline = 0; + uint32_t width = 0; + uint32_t height = 0; uint8_t* data = NULL; int ret = -1; diff --git a/rdtk/sample/rdtk_x11.c b/rdtk/sample/rdtk_x11.c index ae479ef1a..e3566ad40 100644 --- a/rdtk/sample/rdtk_x11.c +++ b/rdtk/sample/rdtk_x11.c @@ -30,32 +30,32 @@ int main(int argc, char** argv) { - GC gc; - int index; - int depth; - int x; - int y; - int width; - int height; - uint8_t* buffer; - int scanline; - int pf_count; + GC gc = NULL; + int index = 0; + int depth = 0; + int x = 0; + int y = 0; + int width = 0; + int height = 0; + uint8_t* buffer = NULL; + int scanline = 0; + int pf_count = 0; XEvent event; - XImage* image; - Pixmap pixmap; - Screen* screen; - Visual* visual; - int scanline_pad; - int screen_number; - Display* display; - Window window; - Window root_window; - rdtkEngine* engine; - rdtkSurface* surface; - unsigned long border; - unsigned long background; - XPixmapFormatValues* pf; - XPixmapFormatValues* pfs; + XImage* image = NULL; + Pixmap pixmap = 0; + Screen* screen = NULL; + Visual* visual = NULL; + int scanline_pad = 0; + int screen_number = 0; + Display* display = NULL; + Window window = 0; + Window root_window = 0; + rdtkEngine* engine = NULL; + rdtkSurface* surface = NULL; + unsigned long border = 0; + unsigned long background = 0; + XPixmapFormatValues* pf = NULL; + XPixmapFormatValues* pfs = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/server/Sample/sfreerdp.c b/server/Sample/sfreerdp.c index ebb67bba7..57dda5d96 100644 --- a/server/Sample/sfreerdp.c +++ b/server/Sample/sfreerdp.c @@ -170,9 +170,9 @@ static wStream* test_peer_stream_init(testPeerContext* context) static void test_peer_begin_frame(freerdp_peer* client) { - rdpUpdate* update; + rdpUpdate* update = NULL; SURFACE_FRAME_MARKER fm = { 0 }; - testPeerContext* context; + testPeerContext* context = NULL; WINPR_ASSERT(client); WINPR_ASSERT(client->context); @@ -191,9 +191,9 @@ static void test_peer_begin_frame(freerdp_peer* client) static void test_peer_end_frame(freerdp_peer* client) { - rdpUpdate* update; + rdpUpdate* update = NULL; SURFACE_FRAME_MARKER fm = { 0 }; - testPeerContext* context; + testPeerContext* context = NULL; WINPR_ASSERT(client); @@ -212,14 +212,14 @@ static void test_peer_end_frame(freerdp_peer* client) static BOOL test_peer_draw_background(freerdp_peer* client) { - size_t size; - wStream* s; + size_t size = 0; + wStream* s = NULL; RFX_RECT rect; - BYTE* rgb_data; - const rdpSettings* settings; - rdpUpdate* update; + BYTE* rgb_data = NULL; + const rdpSettings* settings = NULL; + rdpUpdate* update = NULL; SURFACE_BITS_COMMAND cmd = { 0 }; - testPeerContext* context; + testPeerContext* context = NULL; BOOL ret = FALSE; const UINT32 colorFormat = PIXEL_FORMAT_RGB24; const size_t bpp = FreeRDPGetBytesPerPixel(colorFormat); @@ -331,8 +331,8 @@ static int open_icon(wImage* img) static BOOL test_peer_load_icon(freerdp_peer* client) { - testPeerContext* context; - rdpSettings* settings; + testPeerContext* context = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(client); @@ -366,12 +366,12 @@ out_fail: static void test_peer_draw_icon(freerdp_peer* client, UINT32 x, UINT32 y) { - wStream* s; + wStream* s = NULL; RFX_RECT rect; - rdpUpdate* update; - rdpSettings* settings; + rdpUpdate* update = NULL; + rdpSettings* settings = NULL; SURFACE_BITS_COMMAND cmd = { 0 }; - testPeerContext* context; + testPeerContext* context = NULL; WINPR_ASSERT(client); @@ -495,8 +495,8 @@ static void test_peer_draw_icon(freerdp_peer* client, UINT32 x, UINT32 y) static BOOL test_sleep_tsdiff(UINT32* old_sec, UINT32* old_usec, UINT32 new_sec, UINT32 new_usec) { - INT64 sec; - INT64 usec; + INT64 sec = 0; + INT64 usec = 0; WINPR_ASSERT(old_sec); WINPR_ASSERT(old_usec); @@ -537,13 +537,13 @@ static BOOL test_sleep_tsdiff(UINT32* old_sec, UINT32* old_usec, UINT32 new_sec, static BOOL tf_peer_dump_rfx(freerdp_peer* client) { - wStream* s; - UINT32 prev_seconds; - UINT32 prev_useconds; - rdpUpdate* update; - rdpPcap* pcap_rfx; + wStream* s = NULL; + UINT32 prev_seconds = 0; + UINT32 prev_useconds = 0; + rdpUpdate* update = NULL; + rdpPcap* pcap_rfx = NULL; pcap_record record = { 0 }; - struct server_info* info; + struct server_info* info = NULL; WINPR_ASSERT(client); WINPR_ASSERT(client->context); @@ -596,11 +596,11 @@ static BOOL tf_peer_dump_rfx(freerdp_peer* client) static DWORD WINAPI tf_debug_channel_thread_func(LPVOID arg) { - void* fd; - wStream* s; - void* buffer; + void* fd = NULL; + wStream* s = NULL; + void* buffer = NULL; DWORD BytesReturned = 0; - ULONG written; + ULONG written = 0; testPeerContext* context = (testPeerContext*)arg; WINPR_ASSERT(context); @@ -619,7 +619,7 @@ static DWORD WINAPI tf_debug_channel_thread_func(LPVOID arg) while (1) { - DWORD status; + DWORD status = 0; DWORD nCount = 0; HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 }; @@ -663,8 +663,8 @@ fail: static BOOL tf_peer_post_connect(freerdp_peer* client) { - testPeerContext* context; - rdpSettings* settings; + testPeerContext* context = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(client); @@ -774,9 +774,9 @@ static BOOL tf_peer_post_connect(freerdp_peer* client) static BOOL tf_peer_activate(freerdp_peer* client) { - testPeerContext* context; - struct server_info* info; - rdpSettings* settings; + testPeerContext* context = NULL; + struct server_info* info = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(client); @@ -820,11 +820,11 @@ static BOOL tf_peer_synchronize_event(rdpInput* input, UINT32 flags) static BOOL tf_peer_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code) { - freerdp_peer* client; - rdpUpdate* update; - rdpContext* context; - testPeerContext* tcontext; - rdpSettings* settings; + freerdp_peer* client = NULL; + rdpUpdate* update = NULL; + rdpContext* context = NULL; + testPeerContext* tcontext = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(input); @@ -878,7 +878,7 @@ static BOOL tf_peer_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code) { if (tcontext->debug_channel) { - ULONG written; + ULONG written = 0; WTSVirtualChannelWrite(tcontext->debug_channel, (PCHAR) "test2", 5, &written); } } @@ -941,7 +941,7 @@ static BOOL tf_peer_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x static BOOL tf_peer_refresh_rect(rdpContext* context, BYTE count, const RECTANGLE_16* areas) { - BYTE i; + BYTE i = 0; WINPR_UNUSED(context); WINPR_ASSERT(context); WINPR_ASSERT(areas || (count == 0)); @@ -981,10 +981,9 @@ static int hook_peer_write_pdu(rdpTransport* transport, wStream* s) UINT64 ts = 0; wStream* ls = NULL; UINT64 last_ts = 0; - const struct server_info* info; - freerdp_peer* client; - CONNECTION_STATE state; - testPeerContext* peerCtx; + const struct server_info* info = NULL; + freerdp_peer* client = NULL; + testPeerContext* peerCtx = NULL; size_t offset = 0; UINT32 flags = 0; rdpContext* context = transport_get_context(transport); @@ -1010,7 +1009,7 @@ static int hook_peer_write_pdu(rdpTransport* transport, wStream* s) * configuration as the one that recorded the session! */ WINPR_ASSERT(info); - state = freerdp_get_state(context); + CONNECTION_STATE state = freerdp_get_state(context); if (state < CONNECTION_STATE_NEGO) return peerCtx->io.WritePdu(transport, s); @@ -1020,7 +1019,7 @@ static int hook_peer_write_pdu(rdpTransport* transport, wStream* s) while (stream_dump_get(context, &flags, ls, &offset, &ts) > 0) { - int rc; + int rc = 0; /* Skip messages from client. */ if (flags & STREAM_MSG_SRV_TX) { @@ -1044,16 +1043,16 @@ fail: static DWORD WINAPI test_peer_mainloop(LPVOID arg) { - BOOL rc; + BOOL rc = 0; DWORD error = CHANNEL_RC_OK; HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 }; DWORD count = 0; DWORD status = 0; testPeerContext* context = NULL; - struct server_info* info; - rdpSettings* settings; - rdpInput* input; - rdpUpdate* update; + struct server_info* info = NULL; + rdpSettings* settings = NULL; + rdpInput* input = NULL; + rdpUpdate* update = NULL; freerdp_peer* client = (freerdp_peer*)arg; WINPR_ASSERT(client); @@ -1245,8 +1244,8 @@ fail: static BOOL test_peer_accepted(freerdp_listener* instance, freerdp_peer* client) { - HANDLE hThread; - struct server_info* info; + HANDLE hThread = NULL; + struct server_info* info = NULL; WINPR_UNUSED(instance); diff --git a/server/common/server.c b/server/common/server.c index 3e22d10b0..30520bbaa 100644 --- a/server/common/server.c +++ b/server/common/server.c @@ -92,7 +92,7 @@ size_t server_audin_get_formats(AUDIO_FORMAT** dst_formats) { WAVE_FORMAT_ALAW, 1, 22050, 22050, 2, 8, 0, NULL } }; const size_t nrDefaultFormatsMax = ARRAYSIZE(default_supported_audio_formats); - size_t x; + size_t x = 0; size_t nr_formats = 0; AUDIO_FORMAT* formats = audio_formats_new(nrDefaultFormatsMax); @@ -126,7 +126,7 @@ fail: size_t server_rdpsnd_get_formats(AUDIO_FORMAT** dst_formats) { - size_t x; + size_t x = 0; size_t y = 0; /* Default supported audio formats */ static const AUDIO_FORMAT default_supported_audio_formats[] = { diff --git a/server/proxy/channels/pf_channel_drdynvc.c b/server/proxy/channels/pf_channel_drdynvc.c index 864b74fc8..a16d8763b 100644 --- a/server/proxy/channels/pf_channel_drdynvc.c +++ b/server/proxy/channels/pf_channel_drdynvc.c @@ -232,12 +232,12 @@ static DynvcReadResult dynvc_read_varInt(wLog* log, wStream* s, size_t len, UINT static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL firstPacket, BOOL lastPacket) { - BYTE cmd; - BYTE byte0; - wStream* s; + BYTE cmd = 0; + BYTE byte0 = 0; + wStream* s = NULL; wStream sbuffer; - BOOL haveChannelId; - BOOL haveLength; + BOOL haveChannelId = 0; + BOOL haveLength = 0; UINT64 dynChannelId = 0; UINT64 Length = 0; pServerDynamicChannelContext* dynChannel = NULL; @@ -350,7 +350,7 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir case CREATE_REQUEST_PDU: { - UINT32 creationStatus; + UINT32 creationStatus = 0; /* we only want the full packet */ if (!lastPacket) @@ -559,7 +559,7 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir } } - PfChannelResult result; + PfChannelResult result = PF_CHANNEL_RESULT_ERROR; switch (dynChannel->channelMode) { case PF_UTILS_CHANNEL_PASSTHROUGH: diff --git a/server/proxy/channels/pf_channel_rdpdr.c b/server/proxy/channels/pf_channel_rdpdr.c index 7a00a91df..62c2acd00 100644 --- a/server/proxy/channels/pf_channel_rdpdr.c +++ b/server/proxy/channels/pf_channel_rdpdr.c @@ -219,7 +219,7 @@ static wStream* rdpdr_server_get_send_buffer(pf_channel_server_context* rdpdr, U static UINT rdpdr_client_send(wLog* log, pClientContext* pc, wStream* s) { - UINT16 channelId; + UINT16 channelId = 0; WINPR_ASSERT(log); WINPR_ASSERT(pc); @@ -250,8 +250,8 @@ static UINT rdpdr_client_send(wLog* log, pClientContext* pc, wStream* s) static UINT rdpdr_seal_send_free_request(pf_channel_server_context* context, wStream* s) { - BOOL status; - size_t len; + BOOL status = 0; + size_t len = 0; WINPR_ASSERT(context); WINPR_ASSERT(context->handle); @@ -269,8 +269,8 @@ static UINT rdpdr_seal_send_free_request(pf_channel_server_context* context, wSt static BOOL rdpdr_process_server_header(BOOL server, wLog* log, wStream* s, UINT16 component, UINT16 PacketId, size_t expect) { - UINT16 rpacketid; - UINT16 rcomponent; + UINT16 rpacketid = 0; + UINT16 rcomponent = 0; WINPR_ASSERT(s); if (!Stream_CheckAndLogRequiredLengthRx(server, log, s, 4)) @@ -389,9 +389,9 @@ static UINT rdpdr_process_client_announce_reply(pf_channel_server_context* rdpdr { const UINT16 component = RDPDR_CTYP_CORE; const UINT16 packetid = PAKID_CORE_CLIENTID_CONFIRM; - UINT16 versionMajor; - UINT16 versionMinor; - UINT32 clientID; + UINT16 versionMajor = 0; + UINT16 versionMinor = 0; + UINT32 clientID = 0; WINPR_ASSERT(rdpdr); WINPR_ASSERT(s); @@ -490,7 +490,7 @@ static UINT rdpdr_process_client_name_request(pf_channel_server_context* rdpdr, static UINT rdpdr_send_client_name_request(pClientContext* pc, pf_channel_client_context* rdpdr) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(rdpdr); WINPR_ASSERT(pc); @@ -569,8 +569,8 @@ static UINT rdpdr_process_server_core_capability_request(pf_channel_client_conte wStream* s) { UINT status = CHANNEL_RC_OK; - UINT16 i; - UINT16 numCapabilities; + UINT16 i = 0; + UINT16 numCapabilities = 0; WINPR_ASSERT(rdpdr); @@ -735,8 +735,8 @@ static UINT rdpdr_process_client_capability_response(pf_channel_server_context* const UINT16 component = RDPDR_CTYP_CORE; const UINT16 packetid = PAKID_CORE_CLIENT_CAPABILITY; UINT status = CHANNEL_RC_OK; - UINT16 numCapabilities; - UINT16 x; + UINT16 numCapabilities = 0; + UINT16 x = 0; WINPR_ASSERT(rdpdr); if (!rdpdr_process_server_header(TRUE, rdpdr->log, s, component, packetid, 4)) @@ -803,7 +803,7 @@ static UINT rdpdr_process_client_capability_response(pf_channel_server_context* static UINT rdpdr_send_client_capability_response(pClientContext* pc, pf_channel_client_context* rdpdr) { - wStream* s; + wStream* s = NULL; WINPR_ASSERT(rdpdr); s = rdpdr_client_get_send_buffer(rdpdr, RDPDR_CTYP_CORE, PAKID_CORE_CLIENT_CAPABILITY, 4); @@ -827,7 +827,7 @@ static UINT rdpdr_send_client_capability_response(pClientContext* pc, static UINT rdpdr_send_server_clientid_confirm(pf_channel_server_context* rdpdr) { - wStream* s; + wStream* s = NULL; s = rdpdr_server_get_send_buffer(rdpdr, RDPDR_CTYP_CORE, PAKID_CORE_CLIENTID_CONFIRM, 8); if (!s) @@ -840,9 +840,9 @@ static UINT rdpdr_send_server_clientid_confirm(pf_channel_server_context* rdpdr) static UINT rdpdr_process_server_clientid_confirm(pf_channel_client_context* rdpdr, wStream* s) { - UINT16 versionMajor; - UINT16 versionMinor; - UINT32 clientID; + UINT16 versionMajor = 0; + UINT16 versionMinor = 0; + UINT32 clientID = 0; WINPR_ASSERT(rdpdr); WINPR_ASSERT(s); @@ -893,8 +893,8 @@ rdpdr_process_server_capability_request_or_clientid_confirm(pf_channel_client_co const UINT32 mask = STATE_CLIENT_EXPECT_SERVER_CLIENT_ID_CONFIRM | STATE_CLIENT_EXPECT_SERVER_CORE_CAPABILITY_REQUEST; const UINT16 rcomponent = RDPDR_CTYP_CORE; - UINT16 component; - UINT16 packetid; + UINT16 component = 0; + UINT16 packetid = 0; WINPR_ASSERT(rdpdr); WINPR_ASSERT(s); @@ -946,7 +946,7 @@ rdpdr_process_server_capability_request_or_clientid_confirm(pf_channel_client_co static UINT rdpdr_send_emulated_scard_device_list_announce_request(pClientContext* pc, pf_channel_client_context* rdpdr) { - wStream* s; + wStream* s = NULL; s = rdpdr_client_get_send_buffer(rdpdr, RDPDR_CTYP_CORE, PAKID_CORE_DEVICELIST_ANNOUNCE, 24); if (!s) @@ -966,7 +966,7 @@ static UINT rdpdr_send_emulated_scard_device_list_announce_request(pClientContex static UINT rdpdr_send_emulated_scard_device_remove(pClientContext* pc, pf_channel_client_context* rdpdr) { - wStream* s; + wStream* s = NULL; s = rdpdr_client_get_send_buffer(rdpdr, RDPDR_CTYP_CORE, PAKID_CORE_DEVICELIST_REMOVE, 24); if (!s) @@ -984,8 +984,8 @@ static UINT rdpdr_process_server_device_announce_response(pf_channel_client_cont { const UINT16 component = RDPDR_CTYP_CORE; const UINT16 packetid = PAKID_CORE_DEVICE_REPLY; - UINT32 deviceID; - UINT32 resultCode; + UINT32 deviceID = 0; + UINT32 resultCode = 0; WINPR_ASSERT(rdpdr); WINPR_ASSERT(s); @@ -1110,8 +1110,8 @@ static BOOL pf_channel_rdpdr_rewrite_device_list(pf_channel_client_context* rdpd WINPR_ASSERT(ps); const size_t pos = Stream_GetPosition(s); - UINT16 component; - UINT16 packetid; + UINT16 component = 0; + UINT16 packetid = 0; Stream_SetPosition(s, 0); if (!Stream_CheckAndLogRequiredLengthWLog(rdpdr->log, s, 4)) @@ -1195,10 +1195,10 @@ static BOOL filter_smartcard_io_requests(pf_channel_client_context* rdpdr, wStre UINT16* pPacketid) { BOOL rc = FALSE; - UINT16 component; - UINT16 packetid; + UINT16 component = 0; + UINT16 packetid = 0; UINT32 deviceID = 0; - size_t pos; + size_t pos = 0; WINPR_ASSERT(rdpdr); WINPR_ASSERT(pPacketid); @@ -1261,7 +1261,7 @@ fail: BOOL pf_channel_send_client_queue(pClientContext* pc, pf_channel_client_context* rdpdr) { - UINT16 channelId; + UINT16 channelId = 0; WINPR_ASSERT(pc); WINPR_ASSERT(rdpdr); @@ -1315,11 +1315,11 @@ static BOOL rdpdr_handle_server_announce_request(pClientContext* pc, BOOL pf_channel_rdpdr_client_handle(pClientContext* pc, UINT16 channelId, const char* channel_name, const BYTE* xdata, size_t xsize, UINT32 flags, size_t totalSize) { - pf_channel_client_context* rdpdr; - pServerContext* ps; - wStream* s; + pf_channel_client_context* rdpdr = NULL; + pServerContext* ps = NULL; + wStream* s = NULL; #if defined(WITH_PROXY_EMULATE_SMARTCARD) - UINT16 packetid; + UINT16 packetid = 0; #endif WINPR_ASSERT(pc); @@ -1513,7 +1513,7 @@ static BOOL pf_channel_rdpdr_client_pass_message(pServerContext* ps, pClientCont UINT16 channelId, const char* channel_name, wStream* s) { - pf_channel_client_context* rdpdr; + pf_channel_client_context* rdpdr = NULL; WINPR_ASSERT(ps); WINPR_ASSERT(pc); @@ -1534,9 +1534,9 @@ static BOOL pf_channel_rdpdr_client_pass_message(pServerContext* ps, pClientCont #if defined(WITH_PROXY_EMULATE_SMARTCARD) static BOOL filter_smartcard_device_list_remove(pf_channel_server_context* rdpdr, wStream* s) { - size_t pos; - UINT32 x; - UINT32 count; + size_t pos = 0; + UINT32 x = 0; + UINT32 count = 0; WINPR_ASSERT(rdpdr); if (!Stream_CheckAndLogRequiredLengthWLog(rdpdr->log, s, sizeof(UINT32))) @@ -1552,7 +1552,7 @@ static BOOL filter_smartcard_device_list_remove(pf_channel_server_context* rdpdr for (x = 0; x < count; x++) { - UINT32 deviceID; + UINT32 deviceID = 0; BYTE* dst = Stream_Pointer(s); Stream_Read_UINT32(s, deviceID); if (deviceID == SCARD_DEVICE_ID) @@ -1578,7 +1578,7 @@ static BOOL filter_smartcard_device_list_remove(pf_channel_server_context* rdpdr static BOOL filter_smartcard_device_io_request(pf_channel_server_context* rdpdr, wStream* s) { - UINT32 DeviceID; + UINT32 DeviceID = 0; WINPR_ASSERT(rdpdr); WINPR_ASSERT(s); Stream_Read_UINT32(s, DeviceID); @@ -1587,7 +1587,7 @@ static BOOL filter_smartcard_device_io_request(pf_channel_server_context* rdpdr, static BOOL filter_smartcard_device_list_announce(pf_channel_server_context* rdpdr, wStream* s) { - UINT32 count; + UINT32 count = 0; WINPR_ASSERT(rdpdr); if (!Stream_CheckAndLogRequiredLengthWLog(rdpdr->log, s, sizeof(UINT32))) @@ -1600,10 +1600,10 @@ static BOOL filter_smartcard_device_list_announce(pf_channel_server_context* rdp for (UINT32 x = 0; x < count; x++) { - UINT32 DeviceType; - UINT32 DeviceId; + UINT32 DeviceType = 0; + UINT32 DeviceId = 0; char PreferredDosName[8]; - UINT32 DeviceDataLength; + UINT32 DeviceDataLength = 0; BYTE* dst = Stream_Pointer(s); if (!Stream_CheckAndLogRequiredLengthWLog(rdpdr->log, s, 20)) return TRUE; @@ -1636,9 +1636,9 @@ static BOOL filter_smartcard_device_list_announce_request(pf_channel_server_cont wStream* s) { BOOL rc = TRUE; - size_t pos; - UINT16 component; - UINT16 packetid; + size_t pos = 0; + UINT16 component = 0; + UINT16 packetid = 0; WINPR_ASSERT(rdpdr); if (!Stream_CheckAndLogRequiredLengthWLog(rdpdr->log, s, 8)) @@ -1718,8 +1718,8 @@ static const char* pf_channel_rdpdr_client_context(void* arg) BOOL pf_channel_rdpdr_client_new(pClientContext* pc) { - wObject* obj; - pf_channel_client_context* rdpdr; + wObject* obj = NULL; + pf_channel_client_context* rdpdr = NULL; WINPR_ASSERT(pc); WINPR_ASSERT(pc->interceptContextMap); @@ -1782,7 +1782,7 @@ static const char* pf_channel_rdpdr_server_context(void* arg) BOOL pf_channel_rdpdr_server_new(pServerContext* ps) { - pf_channel_server_context* rdpdr; + pf_channel_server_context* rdpdr = NULL; PULONG pSessionId = NULL; DWORD BytesReturned = 0; @@ -1830,7 +1830,7 @@ void pf_channel_rdpdr_server_free(pServerContext* ps) static pf_channel_server_context* get_channel(pServerContext* ps, BOOL send) { - pf_channel_server_context* rdpdr; + pf_channel_server_context* rdpdr = NULL; WINPR_ASSERT(ps); WINPR_ASSERT(ps->interceptContextMap); @@ -1849,8 +1849,8 @@ static pf_channel_server_context* get_channel(pServerContext* ps, BOOL send) BOOL pf_channel_rdpdr_server_handle(pServerContext* ps, UINT16 channelId, const char* channel_name, const BYTE* xdata, size_t xsize, UINT32 flags, size_t totalSize) { - wStream* s; - pClientContext* pc; + wStream* s = NULL; + pClientContext* pc = NULL; pf_channel_server_context* rdpdr = get_channel(ps, FALSE); if (!rdpdr) return FALSE; @@ -1944,7 +1944,7 @@ BOOL pf_channel_rdpdr_server_announce(pServerContext* ps) BOOL pf_channel_rdpdr_client_reset(pClientContext* pc) { - pf_channel_client_context* rdpdr; + pf_channel_client_context* rdpdr = NULL; WINPR_ASSERT(pc); WINPR_ASSERT(pc->pdata); diff --git a/server/proxy/channels/pf_channel_smartcard.c b/server/proxy/channels/pf_channel_smartcard.c index 17ba52963..1d2bdfe6b 100644 --- a/server/proxy/channels/pf_channel_smartcard.c +++ b/server/proxy/channels/pf_channel_smartcard.c @@ -60,7 +60,7 @@ typedef struct static pf_channel_client_context* scard_get_client_context(pClientContext* pc) { - pf_channel_client_context* scard; + pf_channel_client_context* scard = NULL; WINPR_ASSERT(pc); WINPR_ASSERT(pc->interceptContextMap); @@ -74,11 +74,11 @@ static pf_channel_client_context* scard_get_client_context(pClientContext* pc) static BOOL pf_channel_client_write_iostatus(wStream* out, const SMARTCARD_OPERATION* op, UINT32 ioStatus) { - UINT16 component; - UINT16 packetid; - UINT32 dID; - UINT32 cID; - size_t pos; + UINT16 component = 0; + UINT16 packetid = 0; + UINT32 dID = 0; + UINT32 cID = 0; + size_t pos = 0; WINPR_ASSERT(op); WINPR_ASSERT(out); @@ -118,7 +118,7 @@ static VOID irp_thread(PTP_CALLBACK_INSTANCE Instance, PVOID Context, PTP_WORK W struct thread_arg* arg = Context; pf_channel_client_context* scard = arg->scard; { - UINT32 ioStatus; + UINT32 ioStatus = 0; LONG rc = smartcard_irp_device_control_call(arg->scard->callctx, arg->e->out, &ioStatus, &arg->e->op); if (rc == CHANNEL_RC_OK) @@ -135,7 +135,7 @@ static VOID irp_thread(PTP_CALLBACK_INSTANCE Instance, PVOID Context, PTP_WORK W static BOOL start_irp_thread(pf_channel_client_context* scard, const pf_channel_client_queue_element* e) { - PTP_WORK work; + PTP_WORK work = NULL; struct thread_arg* arg = calloc(1, sizeof(struct thread_arg)); if (!arg) return FALSE; @@ -163,10 +163,10 @@ BOOL pf_channel_smartcard_client_handle(wLog* log, pClientContext* pc, wStream* pf_scard_send_fkt_t send_fkt) { BOOL rc = FALSE; - LONG status; - UINT32 FileId; - UINT32 CompletionId; - UINT32 ioStatus; + LONG status = 0; + UINT32 FileId = 0; + UINT32 CompletionId = 0; + UINT32 ioStatus = 0; pf_channel_client_queue_element e = { 0 }; pf_channel_client_context* scard = scard_get_client_context(pc); @@ -187,9 +187,9 @@ BOOL pf_channel_smartcard_client_handle(wLog* log, pClientContext* pc, wStream* return FALSE; else { - UINT32 DeviceId; - UINT32 MajorFunction; - UINT32 MinorFunction; + UINT32 DeviceId = 0; + UINT32 MajorFunction = 0; + UINT32 MinorFunction = 0; Stream_Read_UINT32(s, DeviceId); /* DeviceId (4 bytes) */ Stream_Read_UINT32(s, FileId); /* FileId (4 bytes) */ @@ -312,7 +312,7 @@ static void queue_free(void* obj) static void* queue_copy(const void* obj) { const pf_channel_client_queue_element* other = obj; - pf_channel_client_queue_element* copy; + pf_channel_client_queue_element* copy = NULL; if (!other) return NULL; copy = calloc(1, sizeof(pf_channel_client_queue_element)); @@ -338,8 +338,8 @@ static void work_object_free(void* arg) BOOL pf_channel_smartcard_client_new(pClientContext* pc) { - pf_channel_client_context* scard; - wObject* obj; + pf_channel_client_context* scard = NULL; + wObject* obj = NULL; WINPR_ASSERT(pc); WINPR_ASSERT(pc->interceptContextMap); diff --git a/server/proxy/modules/demo/demo.cpp b/server/proxy/modules/demo/demo.cpp index a6d89ce36..75526ef6d 100644 --- a/server/proxy/modules/demo/demo.cpp +++ b/server/proxy/modules/demo/demo.cpp @@ -191,7 +191,7 @@ static BOOL demo_server_session_end(proxyPlugin* plugin, proxyData* pdata, void* static BOOL demo_filter_keyboard_event(proxyPlugin* plugin, proxyData* pdata, void* param) { - proxyPluginsManager* mgr; + proxyPluginsManager* mgr = nullptr; auto event_data = static_cast(param); WINPR_ASSERT(plugin); @@ -216,7 +216,7 @@ static BOOL demo_filter_keyboard_event(proxyPlugin* plugin, proxyData* pdata, vo static BOOL demo_filter_unicode_event(proxyPlugin* plugin, proxyData* pdata, void* param) { - proxyPluginsManager* mgr; + proxyPluginsManager* mgr = nullptr; auto event_data = static_cast(param); WINPR_ASSERT(plugin); @@ -372,7 +372,7 @@ extern "C" BOOL proxy_module_entry_point(proxyPluginsManager* plugins_manager, void* userdata) { - struct demo_custom_data* custom; + struct demo_custom_data* custom = nullptr; proxyPlugin plugin = {}; plugin.name = plugin_name; diff --git a/server/proxy/pf_channel.c b/server/proxy/pf_channel.c index eacd91e3d..a8f66c4e7 100644 --- a/server/proxy/pf_channel.c +++ b/server/proxy/pf_channel.c @@ -93,7 +93,7 @@ fail: PfChannelResult channelTracker_update(ChannelStateTracker* tracker, const BYTE* xdata, size_t xsize, UINT32 flags, size_t totalSize) { - PfChannelResult result; + PfChannelResult result = PF_CHANNEL_RESULT_ERROR; BOOL firstPacket = (flags & CHANNEL_FLAG_FIRST); BOOL lastPacket = (flags & CHANNEL_FLAG_LAST); @@ -173,11 +173,11 @@ void channelTracker_free(ChannelStateTracker* t) PfChannelResult channelTracker_flushCurrent(ChannelStateTracker* t, BOOL first, BOOL last, BOOL toBack) { - proxyData* pdata; - pServerContext* ps; - pServerStaticChannelContext* channel; + proxyData* pdata = NULL; + pServerContext* ps = NULL; + pServerStaticChannelContext* channel = NULL; UINT32 flags = CHANNEL_FLAG_FIRST; - BOOL r; + BOOL r = 0; const char* direction = toBack ? "F->B" : "B->F"; const size_t currentPacketSize = channelTracker_getCurrentPacketSize(t); wStream* currentPacket = channelTracker_getCurrentPacket(t); diff --git a/server/proxy/pf_client.c b/server/proxy/pf_client.c index 2231e5ce0..942add55f 100644 --- a/server/proxy/pf_client.c +++ b/server/proxy/pf_client.c @@ -71,7 +71,7 @@ static BOOL proxy_server_reactivate(rdpContext* ps, const rdpContext* pc) static void pf_client_on_error_info(void* ctx, const ErrorInfoEventArgs* e) { pClientContext* pc = (pClientContext*)ctx; - pServerContext* ps; + pServerContext* ps = NULL; WINPR_ASSERT(pc); WINPR_ASSERT(pc->pdata); @@ -93,8 +93,8 @@ static void pf_client_on_error_info(void* ctx, const ErrorInfoEventArgs* e) static void pf_client_on_activated(void* ctx, const ActivatedEventArgs* e) { pClientContext* pc = (pClientContext*)ctx; - pServerContext* ps; - freerdp_peer* peer; + pServerContext* ps = NULL; + freerdp_peer* peer = NULL; WINPR_ASSERT(pc); WINPR_ASSERT(pc->pdata); @@ -116,8 +116,8 @@ static void pf_client_on_activated(void* ctx, const ActivatedEventArgs* e) static BOOL pf_client_load_rdpsnd(pClientContext* pc) { rdpContext* context = (rdpContext*)pc; - pServerContext* ps; - const proxyConfig* config; + pServerContext* ps = NULL; + const proxyConfig* config = NULL; WINPR_ASSERT(pc); WINPR_ASSERT(pc->pdata); @@ -143,10 +143,10 @@ static BOOL pf_client_load_rdpsnd(pClientContext* pc) static BOOL pf_client_use_peer_load_balance_info(pClientContext* pc) { - pServerContext* ps; - rdpSettings* settings; - DWORD lb_info_len; - const char* lb_info; + pServerContext* ps = NULL; + rdpSettings* settings = NULL; + DWORD lb_info_len = 0; + const char* lb_info = NULL; WINPR_ASSERT(pc); WINPR_ASSERT(pc->pdata); @@ -223,10 +223,10 @@ static BOOL freerdp_client_load_static_channel_addin(rdpChannels* channels, rdpS static BOOL pf_client_pre_connect(freerdp* instance) { - pClientContext* pc; - pServerContext* ps; - const proxyConfig* config; - rdpSettings* settings; + pClientContext* pc = NULL; + pServerContext* ps = NULL; + const proxyConfig* config = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(instance); pc = (pClientContext*)instance->context; @@ -357,10 +357,10 @@ static BOOL pf_client_update_back_id(pServerContext* ps, const char* name, UINT3 static BOOL pf_client_load_channels(freerdp* instance) { - pClientContext* pc; - pServerContext* ps; - const proxyConfig* config; - rdpSettings* settings; + pClientContext* pc = NULL; + pServerContext* ps = NULL; + const proxyConfig* config = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(instance); pc = (pClientContext*)instance->context; @@ -409,7 +409,7 @@ static BOOL pf_client_load_channels(freerdp* instance) { CHANNEL_DEF* channels = (CHANNEL_DEF*)freerdp_settings_get_pointer_array_writable( settings, FreeRDP_ChannelDefArray, 0); - size_t x; + size_t x = 0; size_t size = freerdp_settings_get_uint32(settings, FreeRDP_ChannelCount); UINT32 id = MCS_GLOBAL_CHANNEL_ID + 1; @@ -454,10 +454,10 @@ static BOOL pf_client_receive_channel_data_hook(freerdp* instance, UINT16 channe const BYTE* xdata, size_t xsize, UINT32 flags, size_t totalSize) { - pClientContext* pc; - pServerContext* ps; - proxyData* pdata; - pServerStaticChannelContext* channel; + pClientContext* pc = NULL; + pServerContext* ps = NULL; + proxyData* pdata = NULL; + pServerStaticChannelContext* channel = NULL; UINT64 channelId64 = channelId; WINPR_ASSERT(instance); @@ -499,8 +499,8 @@ static BOOL pf_client_receive_channel_data_hook(freerdp* instance, UINT16 channe static BOOL pf_client_on_server_heartbeat(freerdp* instance, BYTE period, BYTE count1, BYTE count2) { - pClientContext* pc; - pServerContext* ps; + pClientContext* pc = NULL; + pServerContext* ps = NULL; WINPR_ASSERT(instance); pc = (pClientContext*)instance->context; @@ -528,12 +528,12 @@ static BOOL sendQueuedChannelData(pClientContext* pc) if (pc->connected) { - proxyChannelDataEventInfo* ev; + proxyChannelDataEventInfo* ev = NULL; Queue_Lock(pc->cached_server_channel_data); while (rc && (ev = Queue_Dequeue(pc->cached_server_channel_data))) { - UINT16 channelId; + UINT16 channelId = 0; WINPR_ASSERT(pc->context.instance); channelId = freerdp_channels_get_id_by_name(pc->context.instance, ev->channel_name); @@ -567,12 +567,12 @@ static BOOL sendQueuedChannelData(pClientContext* pc) */ static BOOL pf_client_post_connect(freerdp* instance) { - rdpContext* context; - rdpSettings* settings; - rdpUpdate* update; - rdpContext* ps; - pClientContext* pc; - const proxyConfig* config; + rdpContext* context = NULL; + rdpSettings* settings = NULL; + rdpUpdate* update = NULL; + rdpContext* ps = NULL; + pClientContext* pc = NULL; + const proxyConfig* config = NULL; WINPR_ASSERT(instance); context = instance->context; @@ -623,8 +623,8 @@ static BOOL pf_client_post_connect(freerdp* instance) */ static void pf_client_post_disconnect(freerdp* instance) { - pClientContext* pc; - proxyData* pdata; + pClientContext* pc = NULL; + proxyData* pdata = NULL; if (!instance) return; @@ -656,8 +656,8 @@ static void pf_client_post_disconnect(freerdp* instance) static BOOL pf_client_redirect(freerdp* instance) { - pClientContext* pc; - proxyData* pdata; + pClientContext* pc = NULL; + proxyData* pdata = NULL; if (!instance) return FALSE; @@ -686,8 +686,8 @@ static BOOL pf_client_redirect(freerdp* instance) */ static BOOL pf_client_should_retry_without_nla(pClientContext* pc) { - rdpSettings* settings; - const proxyConfig* config; + rdpSettings* settings = NULL; + const proxyConfig* config = NULL; WINPR_ASSERT(pc); WINPR_ASSERT(pc->pdata); @@ -705,8 +705,8 @@ static BOOL pf_client_should_retry_without_nla(pClientContext* pc) static void pf_client_set_security_settings(pClientContext* pc) { - rdpSettings* settings; - const proxyConfig* config; + rdpSettings* settings = NULL; + const proxyConfig* config = NULL; WINPR_ASSERT(pc); WINPR_ASSERT(pc->pdata); @@ -732,8 +732,8 @@ static void pf_client_set_security_settings(pClientContext* pc) static BOOL pf_client_connect_without_nla(pClientContext* pc) { - freerdp* instance; - rdpSettings* settings; + freerdp* instance = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(pc); instance = pc->context.instance; @@ -760,8 +760,8 @@ static BOOL pf_client_connect_without_nla(pClientContext* pc) static BOOL pf_client_connect(freerdp* instance) { - pClientContext* pc; - rdpSettings* settings; + pClientContext* pc = NULL; + rdpSettings* settings = NULL; BOOL rc = FALSE; BOOL retry = FALSE; @@ -813,10 +813,10 @@ out: */ static DWORD WINAPI pf_client_thread_proc(pClientContext* pc) { - freerdp* instance; - proxyData* pdata; + freerdp* instance = NULL; + proxyData* pdata = NULL; DWORD nCount = 0; - DWORD status; + DWORD status = 0; HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 }; WINPR_ASSERT(pc); @@ -926,7 +926,7 @@ static void pf_client_context_free(freerdp* instance, rdpContext* context) static int pf_client_verify_X509_certificate(freerdp* instance, const BYTE* data, size_t length, const char* hostname, UINT16 port, DWORD flags) { - pClientContext* pc; + pClientContext* pc = NULL; WINPR_ASSERT(instance); WINPR_ASSERT(data); @@ -984,7 +984,7 @@ static void* channel_data_copy(const void* obj) void* pv; } cnv; const proxyChannelDataEventInfo* src = obj; - proxyChannelDataEventInfo* dst; + proxyChannelDataEventInfo* dst = NULL; WINPR_ASSERT(src); @@ -1014,7 +1014,7 @@ fail: static BOOL pf_client_client_new(freerdp* instance, rdpContext* context) { - wObject* obj; + wObject* obj = NULL; pClientContext* pc = (pClientContext*)context; if (!instance || !context) @@ -1058,7 +1058,7 @@ static BOOL pf_client_client_new(freerdp* instance, rdpContext* context) static int pf_client_client_stop(rdpContext* context) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; + proxyData* pdata = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; diff --git a/server/proxy/pf_config.c b/server/proxy/pf_config.c index 904e58568..956ce64de 100644 --- a/server/proxy/pf_config.c +++ b/server/proxy/pf_config.c @@ -138,8 +138,8 @@ static char** pf_config_parse_comma_separated_list(const char* list, size_t* cou static BOOL pf_config_get_uint16(wIniFile* ini, const char* section, const char* key, UINT16* result, BOOL required) { - int val; - const char* strval; + int val = 0; + const char* strval = NULL; WINPR_ASSERT(result); @@ -163,8 +163,8 @@ static BOOL pf_config_get_uint16(wIniFile* ini, const char* section, const char* static BOOL pf_config_get_uint32(wIniFile* ini, const char* section, const char* key, UINT32* result, BOOL required) { - int val; - const char* strval; + int val = 0; + const char* strval = NULL; WINPR_ASSERT(result); @@ -189,8 +189,8 @@ static BOOL pf_config_get_uint32(wIniFile* ini, const char* section, const char* static BOOL pf_config_get_bool(wIniFile* ini, const char* section, const char* key, BOOL fallback) { - int num_value; - const char* str_value; + int num_value = 0; + const char* str_value = NULL; str_value = IniFile_GetKeyValueString(ini, section, key); if (!str_value) @@ -216,7 +216,7 @@ static BOOL pf_config_get_bool(wIniFile* ini, const char* section, const char* k static const char* pf_config_get_str(wIniFile* ini, const char* section, const char* key, BOOL required) { - const char* value; + const char* value = NULL; value = IniFile_GetKeyValueString(ini, section, key); @@ -232,7 +232,7 @@ static const char* pf_config_get_str(wIniFile* ini, const char* section, const c static BOOL pf_config_load_server(wIniFile* ini, proxyConfig* config) { - const char* host; + const char* host = NULL; WINPR_ASSERT(config); host = pf_config_get_str(ini, section_server, key_host, FALSE); @@ -253,7 +253,7 @@ static BOOL pf_config_load_server(wIniFile* ini, proxyConfig* config) static BOOL pf_config_load_target(wIniFile* ini, proxyConfig* config) { - const char* target_value; + const char* target_value = NULL; WINPR_ASSERT(config); config->FixedTarget = pf_config_get_bool(ini, section_target, key_target_fixed, FALSE); @@ -373,8 +373,8 @@ static BOOL pf_config_load_clipboard(wIniFile* ini, proxyConfig* config) static BOOL pf_config_load_modules(wIniFile* ini, proxyConfig* config) { - const char* modules_to_load; - const char* required_modules; + const char* modules_to_load = NULL; + const char* required_modules = NULL; modules_to_load = pf_config_get_str(ini, section_plugins, key_plugins_modules, FALSE); required_modules = pf_config_get_str(ini, section_plugins, key_plugins_required, FALSE); @@ -466,8 +466,8 @@ static char* pf_config_decode_base64(const char* data, const char* name, size_t* static BOOL pf_config_load_certificates(wIniFile* ini, proxyConfig* config) { - const char* tmp1; - const char* tmp2; + const char* tmp1 = NULL; + const char* tmp2 = NULL; WINPR_ASSERT(ini); WINPR_ASSERT(config); @@ -751,7 +751,7 @@ fail: proxyConfig* pf_server_config_load_buffer(const char* buffer) { proxyConfig* config = NULL; - wIniFile* ini; + wIniFile* ini = NULL; ini = IniFile_New(); @@ -798,7 +798,7 @@ out: static void pf_server_config_print_list(char** list, size_t count) { - size_t i; + size_t i = 0; WINPR_ASSERT(list); for (i = 0; i < count; i++) @@ -807,7 +807,7 @@ static void pf_server_config_print_list(char** list, size_t count) void pf_server_config_print(const proxyConfig* config) { - size_t x; + size_t x = 0; WINPR_ASSERT(config); WLog_INFO(TAG, "Proxy configuration:"); @@ -1077,9 +1077,9 @@ static BOOL config_plugin_unload(proxyPlugin* plugin) static BOOL config_plugin_keyboard_event(proxyPlugin* plugin, proxyData* pdata, void* param) { - BOOL rc; - const struct config_plugin_data* custom; - const proxyConfig* cfg; + BOOL rc = 0; + const struct config_plugin_data* custom = NULL; + const proxyConfig* cfg = NULL; const proxyKeyboardEventInfo* event_data = (const proxyKeyboardEventInfo*)(param); WINPR_ASSERT(plugin); @@ -1101,9 +1101,9 @@ static BOOL config_plugin_keyboard_event(proxyPlugin* plugin, proxyData* pdata, static BOOL config_plugin_unicode_event(proxyPlugin* plugin, proxyData* pdata, void* param) { - BOOL rc; - const struct config_plugin_data* custom; - const proxyConfig* cfg; + BOOL rc = 0; + const struct config_plugin_data* custom = NULL; + const proxyConfig* cfg = NULL; const proxyUnicodeEventInfo* event_data = (const proxyUnicodeEventInfo*)(param); WINPR_ASSERT(plugin); @@ -1125,9 +1125,9 @@ static BOOL config_plugin_unicode_event(proxyPlugin* plugin, proxyData* pdata, v static BOOL config_plugin_mouse_event(proxyPlugin* plugin, proxyData* pdata, void* param) { - BOOL rc; - const struct config_plugin_data* custom; - const proxyConfig* cfg; + BOOL rc = 0; + const struct config_plugin_data* custom = NULL; + const proxyConfig* cfg = NULL; const proxyMouseEventInfo* event_data = (const proxyMouseEventInfo*)(param); WINPR_ASSERT(plugin); @@ -1148,9 +1148,9 @@ static BOOL config_plugin_mouse_event(proxyPlugin* plugin, proxyData* pdata, voi static BOOL config_plugin_mouse_ex_event(proxyPlugin* plugin, proxyData* pdata, void* param) { - BOOL rc; - const struct config_plugin_data* custom; - const proxyConfig* cfg; + BOOL rc = 0; + const struct config_plugin_data* custom = NULL; + const proxyConfig* cfg = NULL; const proxyMouseExEventInfo* event_data = (const proxyMouseExEventInfo*)(param); WINPR_ASSERT(plugin); @@ -1197,23 +1197,20 @@ static BOOL config_plugin_server_channel_data(proxyPlugin* plugin, proxyData* pd static BOOL config_plugin_dynamic_channel_create(proxyPlugin* plugin, proxyData* pdata, void* param) { - pf_utils_channel_mode rc; - BOOL accept; - const struct config_plugin_data* custom; - const proxyConfig* cfg; + BOOL accept = 0; const proxyChannelDataEventInfo* channel = (const proxyChannelDataEventInfo*)(param); WINPR_ASSERT(plugin); WINPR_ASSERT(pdata); WINPR_ASSERT(channel); - custom = plugin->custom; + const struct config_plugin_data* custom = plugin->custom; WINPR_ASSERT(custom); - cfg = custom->config; + const proxyConfig* cfg = custom->config; WINPR_ASSERT(cfg); - rc = pf_utils_get_channel_mode(cfg, channel->channel_name); + pf_utils_channel_mode rc = pf_utils_get_channel_mode(cfg, channel->channel_name); switch (rc) { @@ -1265,23 +1262,20 @@ static BOOL config_plugin_dynamic_channel_create(proxyPlugin* plugin, proxyData* static BOOL config_plugin_channel_create(proxyPlugin* plugin, proxyData* pdata, void* param) { - pf_utils_channel_mode rc; - BOOL accept; - const struct config_plugin_data* custom; - const proxyConfig* cfg; + BOOL accept = 0; const proxyChannelDataEventInfo* channel = (const proxyChannelDataEventInfo*)(param); WINPR_ASSERT(plugin); WINPR_ASSERT(pdata); WINPR_ASSERT(channel); - custom = plugin->custom; + const struct config_plugin_data* custom = plugin->custom; WINPR_ASSERT(custom); - cfg = custom->config; + const proxyConfig* cfg = custom->config; WINPR_ASSERT(cfg); - rc = pf_utils_get_channel_mode(cfg, channel->channel_name); + pf_utils_channel_mode rc = pf_utils_get_channel_mode(cfg, channel->channel_name); switch (rc) { case PF_UTILS_CHANNEL_INTERCEPT: @@ -1318,7 +1312,7 @@ static BOOL config_plugin_channel_create(proxyPlugin* plugin, proxyData* pdata, BOOL pf_config_plugin(proxyPluginsManager* plugins_manager, void* userdata) { - struct config_plugin_data* custom; + struct config_plugin_data* custom = NULL; proxyPlugin plugin = { 0 }; plugin.name = config_plugin_name; diff --git a/server/proxy/pf_context.c b/server/proxy/pf_context.c index 0c9d95eda..04433d9dc 100644 --- a/server/proxy/pf_context.c +++ b/server/proxy/pf_context.c @@ -103,7 +103,7 @@ static void HashStaticChannelContext_free(void* ptr) static void client_to_proxy_context_free(freerdp_peer* client, rdpContext* ctx); static BOOL client_to_proxy_context_new(freerdp_peer* client, rdpContext* ctx) { - wObject* obj; + wObject* obj = NULL; pServerContext* context = (pServerContext*)ctx; WINPR_ASSERT(client); @@ -225,7 +225,7 @@ void intercept_context_entry_free(void* obj) BOOL pf_context_copy_settings(rdpSettings* dst, const rdpSettings* src) { BOOL rc = FALSE; - rdpSettings* before_copy; + rdpSettings* before_copy = NULL; const FreeRDP_Settings_Keys_String to_revert[] = { FreeRDP_ConfigPath, FreeRDP_CertificateName }; @@ -273,8 +273,8 @@ out_fail: pClientContext* pf_context_create_client_context(const rdpSettings* clientSettings) { RDP_CLIENT_ENTRY_POINTS clientEntryPoints; - pClientContext* pc; - rdpContext* context; + pClientContext* pc = NULL; + rdpContext* context = NULL; WINPR_ASSERT(clientSettings); @@ -298,8 +298,8 @@ error: proxyData* proxy_data_new(void) { BYTE temp[16]; - char* hex; - proxyData* pdata; + char* hex = NULL; + proxyData* pdata = NULL; pdata = calloc(1, sizeof(proxyData)); if (!pdata) diff --git a/server/proxy/pf_input.c b/server/proxy/pf_input.c index 2ef7c20eb..2ed1c14ee 100644 --- a/server/proxy/pf_input.c +++ b/server/proxy/pf_input.c @@ -46,8 +46,8 @@ static BOOL pf_server_check_and_sync_input_state(pClientContext* pc) static BOOL pf_server_synchronize_event(rdpInput* input, UINT32 flags) { - pServerContext* ps; - pClientContext* pc; + pServerContext* ps = NULL; + pClientContext* pc = NULL; WINPR_ASSERT(input); ps = (pServerContext*)input->context; @@ -66,10 +66,10 @@ static BOOL pf_server_synchronize_event(rdpInput* input, UINT32 flags) static BOOL pf_server_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code) { - const proxyConfig* config; + const proxyConfig* config = NULL; proxyKeyboardEventInfo event = { 0 }; - pServerContext* ps; - pClientContext* pc; + pServerContext* ps = NULL; + pClientContext* pc = NULL; WINPR_ASSERT(input); ps = (pServerContext*)input->context; @@ -99,10 +99,10 @@ static BOOL pf_server_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code) static BOOL pf_server_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code) { - const proxyConfig* config; + const proxyConfig* config = NULL; proxyUnicodeEventInfo event = { 0 }; - pServerContext* ps; - pClientContext* pc; + pServerContext* ps = NULL; + pClientContext* pc = NULL; WINPR_ASSERT(input); ps = (pServerContext*)input->context; @@ -131,9 +131,9 @@ static BOOL pf_server_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT static BOOL pf_server_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y) { proxyMouseEventInfo event = { 0 }; - const proxyConfig* config; - pServerContext* ps; - pClientContext* pc; + const proxyConfig* config = NULL; + pServerContext* ps = NULL; + pClientContext* pc = NULL; WINPR_ASSERT(input); ps = (pServerContext*)input->context; @@ -164,10 +164,10 @@ static BOOL pf_server_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT1 static BOOL pf_server_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y) { - const proxyConfig* config; + const proxyConfig* config = NULL; proxyMouseExEventInfo event = { 0 }; - pServerContext* ps; - pClientContext* pc; + pServerContext* ps = NULL; + pClientContext* pc = NULL; WINPR_ASSERT(input); ps = (pServerContext*)input->context; diff --git a/server/proxy/pf_modules.c b/server/proxy/pf_modules.c index 57a74bc1b..ab7439fa6 100644 --- a/server/proxy/pf_modules.c +++ b/server/proxy/pf_modules.c @@ -125,16 +125,13 @@ static const char* pf_modules_get_hook_type_string(PF_HOOK_TYPE result) static BOOL pf_modules_proxy_ArrayList_ForEachFkt(void* data, size_t index, va_list ap) { proxyPlugin* plugin = (proxyPlugin*)data; - PF_HOOK_TYPE type; - proxyData* pdata; - void* custom; BOOL ok = FALSE; WINPR_UNUSED(index); - type = va_arg(ap, PF_HOOK_TYPE); - pdata = va_arg(ap, proxyData*); - custom = va_arg(ap, void*); + PF_HOOK_TYPE type = va_arg(ap, PF_HOOK_TYPE); + proxyData* pdata = va_arg(ap, proxyData*); + void* custom = va_arg(ap, void*); WLog_VRB(TAG, "running hook %s.%s", plugin->name, pf_modules_get_hook_type_string(type)); @@ -237,16 +234,13 @@ BOOL pf_modules_run_hook(proxyModule* module, PF_HOOK_TYPE type, proxyData* pdat static BOOL pf_modules_ArrayList_ForEachFkt(void* data, size_t index, va_list ap) { proxyPlugin* plugin = (proxyPlugin*)data; - PF_FILTER_TYPE type; - proxyData* pdata; - void* param; BOOL result = FALSE; WINPR_UNUSED(index); - type = va_arg(ap, PF_FILTER_TYPE); - pdata = va_arg(ap, proxyData*); - param = va_arg(ap, void*); + PF_FILTER_TYPE type = va_arg(ap, PF_FILTER_TYPE); + proxyData* pdata = va_arg(ap, proxyData*); + void* param = va_arg(ap, void*); WLog_VRB(TAG, "running filter: %s", plugin->name); @@ -472,7 +466,7 @@ static BOOL pf_modules_print_ArrayList_ForEachFkt(void* data, size_t index, va_l void pf_modules_list_loaded_plugins(proxyModule* module) { - size_t count; + size_t count = 0; WINPR_ASSERT(module); WINPR_ASSERT(module->plugins); @@ -488,7 +482,7 @@ void pf_modules_list_loaded_plugins(proxyModule* module) static BOOL pf_modules_load_module(const char* module_path, proxyModule* module, void* userdata) { HMODULE handle = NULL; - proxyModuleEntryPoint pEntryPoint; + proxyModuleEntryPoint pEntryPoint = NULL; WINPR_ASSERT(module); handle = LoadLibraryX(module_path); @@ -547,8 +541,8 @@ static void* new_plugin(const void* obj) proxyModule* pf_modules_new(const char* root_dir, const char** modules, size_t count) { - size_t i; - wObject* obj; + size_t i = 0; + wObject* obj = NULL; char* path = NULL; proxyModule* module = calloc(1, sizeof(proxyModule)); if (!module) @@ -603,7 +597,7 @@ proxyModule* pf_modules_new(const char* root_dir, const char** modules, size_t c for (i = 0; i < count; i++) { char name[8192] = { 0 }; - char* fullpath; + char* fullpath = NULL; _snprintf(name, sizeof(name), "proxy-%s-plugin%s", modules[i], FREERDP_SHARED_LIBRARY_SUFFIX); fullpath = GetCombinedPath(path, name); diff --git a/server/proxy/pf_server.c b/server/proxy/pf_server.c index e505373ae..1bf1ba3dd 100644 --- a/server/proxy/pf_server.c +++ b/server/proxy/pf_server.c @@ -69,9 +69,9 @@ static BOOL pf_server_parse_target_from_routing_token(rdpContext* context, rdpSe { #define TARGET_MAX (100) #define ROUTING_TOKEN_PREFIX "Cookie: msts=" - char* colon; - size_t len; - DWORD routing_token_length; + char* colon = NULL; + size_t len = 0; + DWORD routing_token_length = 0; const size_t prefix_len = strnlen(ROUTING_TOKEN_PREFIX, sizeof(ROUTING_TOKEN_PREFIX)); const char* routing_token = freerdp_nego_get_routing_token(context, &routing_token_length); pServerContext* ps = (pServerContext*)context; @@ -191,8 +191,8 @@ static BOOL pf_server_get_target_info(rdpContext* context, rdpSettings* settings static BOOL pf_server_setup_channels(freerdp_peer* peer) { char** accepted_channels = NULL; - size_t accepted_channels_count; - size_t i; + size_t accepted_channels_count = 0; + size_t i = 0; pServerContext* ps = (pServerContext*)peer->context; accepted_channels = WTSGetAcceptedChannelNames(peer, &accepted_channels_count); @@ -201,7 +201,7 @@ static BOOL pf_server_setup_channels(freerdp_peer* peer) for (i = 0; i < accepted_channels_count; i++) { - pServerStaticChannelContext* channelContext; + pServerStaticChannelContext* channelContext = NULL; const char* cname = accepted_channels[i]; UINT16 channelId = WTSChannelGetId(peer, cname); @@ -266,11 +266,11 @@ static BOOL pf_server_setup_channels(freerdp_peer* peer) */ static BOOL pf_server_post_connect(freerdp_peer* peer) { - pServerContext* ps; - pClientContext* pc; - rdpSettings* client_settings; - proxyData* pdata; - rdpSettings* frontSettings; + pServerContext* ps = NULL; + pClientContext* pc = NULL; + rdpSettings* client_settings = NULL; + proxyData* pdata = NULL; + rdpSettings* frontSettings = NULL; WINPR_ASSERT(peer); @@ -328,9 +328,9 @@ static BOOL pf_server_post_connect(freerdp_peer* peer) static BOOL pf_server_activate(freerdp_peer* peer) { - pServerContext* ps; - proxyData* pdata; - rdpSettings* settings; + pServerContext* ps = NULL; + proxyData* pdata = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(peer); @@ -353,8 +353,8 @@ static BOOL pf_server_activate(freerdp_peer* peer) static BOOL pf_server_logon(freerdp_peer* peer, const SEC_WINNT_AUTH_IDENTITY* identity, BOOL automatic) { - pServerContext* ps; - proxyData* pdata; + pServerContext* ps = NULL; + proxyData* pdata = NULL; proxyServerPeerLogon info = { 0 }; WINPR_ASSERT(peer); @@ -384,11 +384,11 @@ static BOOL pf_server_receive_channel_data_hook(freerdp_peer* peer, UINT16 chann const BYTE* data, size_t size, UINT32 flags, size_t totalSize) { - pServerContext* ps; - pClientContext* pc; - proxyData* pdata; - const proxyConfig* config; - const pServerStaticChannelContext* channel; + pServerContext* ps = NULL; + pClientContext* pc = NULL; + proxyData* pdata = NULL; + const proxyConfig* config = NULL; + const pServerStaticChannelContext* channel = NULL; UINT64 channelId64 = channelId; WINPR_ASSERT(peer); @@ -734,8 +734,8 @@ out_free_peer: static BOOL pf_server_start_peer(freerdp_peer* client) { - HANDLE hThread; - proxyServer* server; + HANDLE hThread = NULL; + proxyServer* server = NULL; peer_thread_args* args = calloc(1, sizeof(peer_thread_args)); if (!args) return FALSE; @@ -885,7 +885,7 @@ fail: static BOOL are_all_required_modules_loaded(proxyModule* module, const proxyConfig* config) { - size_t i; + size_t i = 0; for (i = 0; i < pf_config_required_plugins_count(config); i++) { @@ -909,8 +909,8 @@ static void peer_free(void* obj) proxyServer* pf_server_new(const proxyConfig* config) { - wObject* obj; - proxyServer* server; + wObject* obj = NULL; + proxyServer* server = NULL; WINPR_ASSERT(config); @@ -970,9 +970,9 @@ BOOL pf_server_run(proxyServer* server) { BOOL rc = TRUE; HANDLE eventHandles[MAXIMUM_WAIT_OBJECTS] = { 0 }; - DWORD eventCount; - DWORD status; - freerdp_listener* listener; + DWORD eventCount = 0; + DWORD status = 0; + freerdp_listener* listener = NULL; WINPR_ASSERT(server); diff --git a/server/proxy/pf_update.c b/server/proxy/pf_update.c index 31103e436..e57281039 100644 --- a/server/proxy/pf_update.c +++ b/server/proxy/pf_update.c @@ -38,7 +38,7 @@ static BOOL pf_server_refresh_rect(rdpContext* context, BYTE count, const RECTANGLE_16* areas) { pServerContext* ps = (pServerContext*)context; - rdpContext* pc; + rdpContext* pc = NULL; WINPR_ASSERT(ps); WINPR_ASSERT(ps->pdata); pc = (rdpContext*)ps->pdata->pc; @@ -51,7 +51,7 @@ static BOOL pf_server_refresh_rect(rdpContext* context, BYTE count, const RECTAN static BOOL pf_server_suppress_output(rdpContext* context, BYTE allow, const RECTANGLE_16* area) { pServerContext* ps = (pServerContext*)context; - rdpContext* pc; + rdpContext* pc = NULL; WINPR_ASSERT(ps); WINPR_ASSERT(ps->pdata); pc = (rdpContext*)ps->pdata->pc; @@ -70,8 +70,8 @@ static BOOL pf_server_suppress_output(rdpContext* context, BYTE allow, const REC static BOOL pf_client_begin_paint(rdpContext* context) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -91,8 +91,8 @@ static BOOL pf_client_begin_paint(rdpContext* context) static BOOL pf_client_end_paint(rdpContext* context) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -116,8 +116,8 @@ static BOOL pf_client_end_paint(rdpContext* context) static BOOL pf_client_bitmap_update(rdpContext* context, const BITMAP_UPDATE* bitmap) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -132,8 +132,8 @@ static BOOL pf_client_bitmap_update(rdpContext* context, const BITMAP_UPDATE* bi static BOOL pf_client_desktop_resize(rdpContext* context) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -155,8 +155,8 @@ static BOOL pf_client_remote_monitors(rdpContext* context, UINT32 count, const MONITOR_DEF* monitors) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -170,8 +170,8 @@ static BOOL pf_client_send_pointer_system(rdpContext* context, const POINTER_SYSTEM_UPDATE* pointer_system) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -188,8 +188,8 @@ static BOOL pf_client_send_pointer_position(rdpContext* context, const POINTER_POSITION_UPDATE* pointerPosition) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -206,8 +206,8 @@ static BOOL pf_client_send_pointer_color(rdpContext* context, const POINTER_COLOR_UPDATE* pointer_color) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -224,8 +224,8 @@ static BOOL pf_client_send_pointer_large(rdpContext* context, const POINTER_LARGE_UPDATE* pointer_large) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -241,8 +241,8 @@ static BOOL pf_client_send_pointer_large(rdpContext* context, static BOOL pf_client_send_pointer_new(rdpContext* context, const POINTER_NEW_UPDATE* pointer_new) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -259,8 +259,8 @@ static BOOL pf_client_send_pointer_cached(rdpContext* context, const POINTER_CACHED_UPDATE* pointer_cached) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -277,8 +277,8 @@ static BOOL pf_client_save_session_info(rdpContext* context, UINT32 type, void* { logon_info* logonInfo = NULL; pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -310,8 +310,8 @@ static BOOL pf_client_save_session_info(rdpContext* context, UINT32 type, void* static BOOL pf_client_server_status_info(rdpContext* context, UINT32 status) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -327,8 +327,8 @@ static BOOL pf_client_server_status_info(rdpContext* context, UINT32 status) static BOOL pf_client_set_keyboard_indicators(rdpContext* context, UINT16 led_flags) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -345,8 +345,8 @@ static BOOL pf_client_set_keyboard_ime_status(rdpContext* context, UINT16 imeId, UINT32 imeConvMode) { pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -362,10 +362,10 @@ static BOOL pf_client_set_keyboard_ime_status(rdpContext* context, UINT16 imeId, static BOOL pf_client_window_create(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_STATE_ORDER* windowState) { - BOOL rc; + BOOL rc = 0; pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -385,10 +385,10 @@ static BOOL pf_client_window_create(rdpContext* context, const WINDOW_ORDER_INFO static BOOL pf_client_window_update(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_STATE_ORDER* windowState) { - BOOL rc; + BOOL rc = 0; pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -408,10 +408,10 @@ static BOOL pf_client_window_update(rdpContext* context, const WINDOW_ORDER_INFO static BOOL pf_client_window_icon(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_ICON_ORDER* windowIcon) { - BOOL rc; + BOOL rc = 0; pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -431,10 +431,10 @@ static BOOL pf_client_window_icon(rdpContext* context, const WINDOW_ORDER_INFO* static BOOL pf_client_window_cached_icon(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_CACHED_ICON_ORDER* windowCachedIcon) { - BOOL rc; + BOOL rc = 0; pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -453,10 +453,10 @@ static BOOL pf_client_window_cached_icon(rdpContext* context, const WINDOW_ORDER static BOOL pf_client_window_delete(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo) { - BOOL rc; + BOOL rc = 0; pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -476,10 +476,10 @@ static BOOL pf_client_window_delete(rdpContext* context, const WINDOW_ORDER_INFO static BOOL pf_client_notify_icon_create(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const NOTIFY_ICON_STATE_ORDER* notifyIconState) { - BOOL rc; + BOOL rc = 0; pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -499,10 +499,10 @@ static BOOL pf_client_notify_icon_create(rdpContext* context, const WINDOW_ORDER static BOOL pf_client_notify_icon_update(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const NOTIFY_ICON_STATE_ORDER* notifyIconState) { - BOOL rc; + BOOL rc = 0; pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -521,11 +521,11 @@ static BOOL pf_client_notify_icon_update(rdpContext* context, const WINDOW_ORDER static BOOL pf_client_notify_icon_delete(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo) { - BOOL rc; + BOOL rc = 0; pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -545,10 +545,10 @@ static BOOL pf_client_notify_icon_delete(rdpContext* context, const WINDOW_ORDER static BOOL pf_client_monitored_desktop(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const MONITORED_DESKTOP_ORDER* monitoredDesktop) { - BOOL rc; + BOOL rc = 0; pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); @@ -567,10 +567,10 @@ static BOOL pf_client_monitored_desktop(rdpContext* context, const WINDOW_ORDER_ static BOOL pf_client_non_monitored_desktop(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo) { - BOOL rc; + BOOL rc = 0; pClientContext* pc = (pClientContext*)context; - proxyData* pdata; - rdpContext* ps; + proxyData* pdata = NULL; + rdpContext* ps = NULL; WINPR_ASSERT(pc); pdata = pc->pdata; WINPR_ASSERT(pdata); diff --git a/server/proxy/pf_utils.c b/server/proxy/pf_utils.c index 9a6b5636b..9a91d97b1 100644 --- a/server/proxy/pf_utils.c +++ b/server/proxy/pf_utils.c @@ -30,7 +30,7 @@ pf_utils_channel_mode pf_utils_get_channel_mode(const proxyConfig* config, const char* name) { pf_utils_channel_mode rc = PF_UTILS_CHANNEL_NOT_HANDLED; - size_t i; + size_t i = 0; BOOL found = FALSE; WINPR_ASSERT(config); diff --git a/server/shadow/X11/x11_shadow.c b/server/shadow/X11/x11_shadow.c index cf0948fa5..5d0af5be5 100644 --- a/server/shadow/X11/x11_shadow.c +++ b/server/shadow/X11/x11_shadow.c @@ -71,10 +71,10 @@ typedef struct static int x11_shadow_pam_conv(int num_msg, const struct pam_message** msg, struct pam_response** resp, void* appdata_ptr) { - int index; + int index = 0; int pam_status = PAM_CONV_ERR; - SHADOW_PAM_AUTH_DATA* appdata; - struct pam_response* response; + SHADOW_PAM_AUTH_DATA* appdata = NULL; + struct pam_response* response = NULL; WINPR_ASSERT(num_msg >= 0); appdata = (SHADOW_PAM_AUTH_DATA*)appdata_ptr; WINPR_ASSERT(appdata); @@ -131,7 +131,7 @@ out_fail: static BOOL x11_shadow_pam_get_service_name(SHADOW_PAM_AUTH_INFO* info) { - size_t x; + size_t x = 0; const char* base = "/etc/pam.d"; const char* hints[] = { "lightdm", "gdm", "xdm", "login", "sshd" }; @@ -155,7 +155,7 @@ static BOOL x11_shadow_pam_get_service_name(SHADOW_PAM_AUTH_INFO* info) static int x11_shadow_pam_authenticate(rdpShadowSubsystem* subsystem, rdpShadowClient* client, const char* user, const char* domain, const char* password) { - int pam_status; + int pam_status = 0; SHADOW_PAM_AUTH_INFO info = { 0 }; WINPR_UNUSED(subsystem); WINPR_UNUSED(client); @@ -210,9 +210,9 @@ static BOOL x11_shadow_input_keyboard_event(rdpShadowSubsystem* subsystem, rdpSh { #ifdef WITH_XTEST x11ShadowSubsystem* x11 = (x11ShadowSubsystem*)subsystem; - DWORD vkcode; - DWORD keycode; - DWORD scancode; + DWORD vkcode = 0; + DWORD keycode = 0; + DWORD scancode = 0; BOOL extended = FALSE; if (!client || !subsystem) @@ -267,8 +267,8 @@ static BOOL x11_shadow_input_mouse_event(rdpShadowSubsystem* subsystem, rdpShado x11ShadowSubsystem* x11 = (x11ShadowSubsystem*)subsystem; unsigned int button = 0; BOOL down = FALSE; - rdpShadowServer* server; - rdpShadowSurface* surface; + rdpShadowServer* server = NULL; + rdpShadowSurface* surface = NULL; if (!subsystem || !client) return FALSE; @@ -345,8 +345,8 @@ static BOOL x11_shadow_input_extended_mouse_event(rdpShadowSubsystem* subsystem, x11ShadowSubsystem* x11 = (x11ShadowSubsystem*)subsystem; UINT button = 0; BOOL down = FALSE; - rdpShadowServer* server; - rdpShadowSurface* surface; + rdpShadowServer* server = NULL; + rdpShadowSurface* surface = NULL; if (!subsystem || !client) return FALSE; @@ -410,7 +410,7 @@ static void x11_shadow_message_free(UINT32 id, SHADOW_MSG_OUT* msg) static int x11_shadow_pointer_position_update(x11ShadowSubsystem* subsystem) { UINT32 msgId = SHADOW_MSG_OUT_POINTER_POSITION_UPDATE_ID; - rdpShadowServer* server; + rdpShadowServer* server = NULL; SHADOW_MSG_OUT_POINTER_POSITION_UPDATE templateMsg; int count = 0; size_t index = 0; @@ -426,7 +426,7 @@ static int x11_shadow_pointer_position_update(x11ShadowSubsystem* subsystem) for (index = 0; index < ArrayList_Count(server->clients); index++) { - SHADOW_MSG_OUT_POINTER_POSITION_UPDATE* msg; + SHADOW_MSG_OUT_POINTER_POSITION_UPDATE* msg = NULL; rdpShadowClient* client = (rdpShadowClient*)ArrayList_GetItem(server->clients, index); /* Skip the client which send us the latest mouse event */ @@ -453,7 +453,7 @@ static int x11_shadow_pointer_position_update(x11ShadowSubsystem* subsystem) static int x11_shadow_pointer_alpha_update(x11ShadowSubsystem* subsystem) { - SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE* msg; + SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE* msg = NULL; UINT32 msgId = SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE_ID; msg = (SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE*)calloc(1, sizeof(SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE)); @@ -484,18 +484,18 @@ static int x11_shadow_query_cursor(x11ShadowSubsystem* subsystem, BOOL getImage) { int x = 0; int y = 0; - int n; - int k; - rdpShadowServer* server; - rdpShadowSurface* surface; + int n = 0; + int k = 0; + rdpShadowServer* server = NULL; + rdpShadowSurface* surface = NULL; server = subsystem->common.server; surface = server->surface; if (getImage) { #ifdef WITH_XFIXES - UINT32* pDstPixel; - XFixesCursorImage* ci; + UINT32* pDstPixel = NULL; + XFixesCursorImage* ci = NULL; XLockDisplay(subsystem->display); ci = XFixesGetCursorImage(subsystem->display); XUnlockDisplay(subsystem->display); @@ -532,13 +532,13 @@ static int x11_shadow_query_cursor(x11ShadowSubsystem* subsystem, BOOL getImage) } else { - UINT32 mask; - int win_x; - int win_y; - int root_x; - int root_y; - Window root; - Window child; + UINT32 mask = 0; + int win_x = 0; + int win_y = 0; + int root_x = 0; + int root_y = 0; + Window root = 0; + Window child = 0; XLockDisplay(subsystem->display); if (!XQueryPointer(subsystem->display, subsystem->root_window, &root, &child, &root_x, @@ -612,23 +612,23 @@ static void x11_shadow_validate_region(x11ShadowSubsystem* subsystem, int x, int static int x11_shadow_blend_cursor(x11ShadowSubsystem* subsystem) { - UINT32 x; - UINT32 y; - UINT32 nXSrc; - UINT32 nYSrc; - INT64 nXDst; - INT64 nYDst; - UINT32 nWidth; - UINT32 nHeight; - UINT32 nSrcStep; - UINT32 nDstStep; - BYTE* pSrcData; - BYTE* pDstData; - BYTE A; - BYTE R; - BYTE G; - BYTE B; - rdpShadowSurface* surface; + UINT32 x = 0; + UINT32 y = 0; + UINT32 nXSrc = 0; + UINT32 nYSrc = 0; + INT64 nXDst = 0; + INT64 nYDst = 0; + UINT32 nWidth = 0; + UINT32 nHeight = 0; + UINT32 nSrcStep = 0; + UINT32 nDstStep = 0; + BYTE* pSrcData = NULL; + BYTE* pDstData = NULL; + BYTE A = 0; + BYTE R = 0; + BYTE G = 0; + BYTE B = 0; + rdpShadowSurface* surface = NULL; if (!subsystem) return -1; @@ -762,18 +762,18 @@ static int x11_shadow_error_handler_for_capture(Display* display, XErrorEvent* e static int x11_shadow_screen_grab(x11ShadowSubsystem* subsystem) { int rc = 0; - size_t count; + size_t count = 0; int status = -1; - int x; - int y; - int width; - int height; - XImage* image; - rdpShadowServer* server; - rdpShadowSurface* surface; + int x = 0; + int y = 0; + int width = 0; + int height = 0; + XImage* image = NULL; + rdpShadowServer* server = NULL; + rdpShadowSurface* surface = NULL; RECTANGLE_16 invalidRect; RECTANGLE_16 surfaceRect; - const RECTANGLE_16* extents; + const RECTANGLE_16* extents = NULL; server = subsystem->common.server; surface = server->surface; count = ArrayList_Count(server->clients); @@ -838,7 +838,7 @@ static int x11_shadow_screen_grab(x11ShadowSubsystem* subsystem) if (status) { - BOOL empty; + BOOL empty = 0; EnterCriticalSection(&surface->lock); region16_union_rect(&(surface->invalidRegion), &(surface->invalidRegion), &invalidRect); region16_intersect_rect(&(surface->invalidRegion), &(surface->invalidRegion), &surfaceRect); @@ -847,7 +847,7 @@ static int x11_shadow_screen_grab(x11ShadowSubsystem* subsystem) if (!empty) { - BOOL success; + BOOL success = 0; EnterCriticalSection(&surface->lock); extents = region16_extents(&(surface->invalidRegion)); x = extents->left; @@ -872,7 +872,7 @@ static int x11_shadow_screen_grab(x11ShadowSubsystem* subsystem) if (count == 1) { - rdpShadowClient* client; + rdpShadowClient* client = NULL; client = (rdpShadowClient*)ArrayList_GetItem(server->clients, 0); if (client) @@ -924,15 +924,15 @@ static DWORD WINAPI x11_shadow_subsystem_thread(LPVOID arg) { x11ShadowSubsystem* subsystem = (x11ShadowSubsystem*)arg; XEvent xevent; - DWORD status; - DWORD nCount; - UINT64 cTime; - DWORD dwTimeout; - DWORD dwInterval; - UINT64 frameTime; + DWORD status = 0; + DWORD nCount = 0; + UINT64 cTime = 0; + DWORD dwTimeout = 0; + DWORD dwInterval = 0; + UINT64 frameTime = 0; HANDLE events[32]; wMessage message; - wMessagePipe* MsgPipe; + wMessagePipe* MsgPipe = NULL; MsgPipe = subsystem->common.MsgPipe; nCount = 0; events[nCount++] = subsystem->common.event; @@ -1017,10 +1017,10 @@ static int x11_shadow_subsystem_base_init(x11ShadowSubsystem* subsystem) static int x11_shadow_xfixes_init(x11ShadowSubsystem* subsystem) { #ifdef WITH_XFIXES - int xfixes_event; - int xfixes_error; - int major; - int minor; + int xfixes_event = 0; + int xfixes_error = 0; + int major = 0; + int minor = 0; if (!XFixesQueryExtension(subsystem->display, &xfixes_event, &xfixes_error)) return -1; @@ -1040,16 +1040,16 @@ static int x11_shadow_xfixes_init(x11ShadowSubsystem* subsystem) static int x11_shadow_xinerama_init(x11ShadowSubsystem* subsystem) { #ifdef WITH_XINERAMA - int xinerama_event; - int xinerama_error; + int xinerama_event = 0; + int xinerama_error = 0; x11_shadow_subsystem_base_init(subsystem); if (!XineramaQueryExtension(subsystem->display, &xinerama_event, &xinerama_error)) return -1; #if defined(WITH_XDAMAGE) - int major; - int minor; + int major = 0; + int minor = 0; if (!XDamageQueryVersion(subsystem->display, &major, &minor)) return -1; #endif @@ -1066,10 +1066,10 @@ static int x11_shadow_xinerama_init(x11ShadowSubsystem* subsystem) static int x11_shadow_xdamage_init(x11ShadowSubsystem* subsystem) { #ifdef WITH_XDAMAGE - int major; - int minor; - int damage_event; - int damage_error; + int major = 0; + int minor = 0; + int damage_event = 0; + int damage_error = 0; if (!subsystem->use_xfixes) return -1; @@ -1105,9 +1105,9 @@ static int x11_shadow_xdamage_init(x11ShadowSubsystem* subsystem) static int x11_shadow_xshm_init(x11ShadowSubsystem* subsystem) { - Bool pixmaps; - int major; - int minor; + Bool pixmaps = 0; + int major = 0; + int minor = 0; XGCValues values; if (!XShmQueryExtension(subsystem->display)) @@ -1178,9 +1178,9 @@ static int x11_shadow_xshm_init(x11ShadowSubsystem* subsystem) UINT32 x11_shadow_enum_monitors(MONITOR_DEF* monitors, UINT32 maxMonitors) { - Display* display; - int displayWidth; - int displayHeight; + Display* display = NULL; + int displayWidth = 0; + int displayHeight = 0; int numMonitors = 0; if (!getenv("DISPLAY")) @@ -1199,12 +1199,12 @@ UINT32 x11_shadow_enum_monitors(MONITOR_DEF* monitors, UINT32 maxMonitors) #ifdef WITH_XINERAMA { #if defined(WITH_XDAMAGE) - int major; - int minor; + int major = 0; + int minor = 0; #endif - int xinerama_event; - int xinerama_error; - XineramaScreenInfo* screens; + int xinerama_event = 0; + int xinerama_error = 0; + XineramaScreenInfo* screens = NULL; const Bool xinerama = XineramaQueryExtension(display, &xinerama_event, &xinerama_error); const Bool damage = @@ -1223,7 +1223,7 @@ UINT32 x11_shadow_enum_monitors(MONITOR_DEF* monitors, UINT32 maxMonitors) if (screens && (numMonitors > 0)) { - int index; + int index = 0; for (index = 0; index < numMonitors; index++) { MONITOR_DEF* monitor = &monitors[index]; @@ -1261,16 +1261,16 @@ UINT32 x11_shadow_enum_monitors(MONITOR_DEF* monitors, UINT32 maxMonitors) static int x11_shadow_subsystem_init(rdpShadowSubsystem* sub) { - int i; - int pf_count; - int vi_count; - int nextensions; - char** extensions; - XVisualInfo* vi; - XVisualInfo* vis; + int i = 0; + int pf_count = 0; + int vi_count = 0; + int nextensions = 0; + char** extensions = NULL; + XVisualInfo* vi = NULL; + XVisualInfo* vis = NULL; XVisualInfo template = { 0 }; - XPixmapFormatValues* pf; - XPixmapFormatValues* pfs; + XPixmapFormatValues* pf = NULL; + XPixmapFormatValues* pfs = NULL; x11ShadowSubsystem* subsystem = (x11ShadowSubsystem*)sub; @@ -1469,7 +1469,7 @@ static int x11_shadow_subsystem_stop(rdpShadowSubsystem* sub) static rdpShadowSubsystem* x11_shadow_subsystem_new(void) { - x11ShadowSubsystem* subsystem; + x11ShadowSubsystem* subsystem = NULL; subsystem = (x11ShadowSubsystem*)calloc(1, sizeof(x11ShadowSubsystem)); if (!subsystem) diff --git a/server/shadow/shadow_audin.c b/server/shadow/shadow_audin.c index 2213f9468..9e7f6ef69 100644 --- a/server/shadow/shadow_audin.c +++ b/server/shadow/shadow_audin.c @@ -35,8 +35,8 @@ static UINT AudinServerData(audin_server_context* audin, const SNDIN_DATA* data) { - rdpShadowClient* client; - rdpShadowSubsystem* subsystem; + rdpShadowClient* client = NULL; + rdpShadowSubsystem* subsystem = NULL; WINPR_ASSERT(audin); WINPR_ASSERT(data); diff --git a/server/shadow/shadow_capture.c b/server/shadow/shadow_capture.c index 8f03eeafe..19bb3e587 100644 --- a/server/shadow/shadow_capture.c +++ b/server/shadow/shadow_capture.c @@ -31,8 +31,8 @@ int shadow_capture_align_clip_rect(RECTANGLE_16* rect, RECTANGLE_16* clip) { - int dx; - int dy; + int dx = 0; + int dy = 0; dx = (rect->left % 16); if (dx != 0) @@ -81,21 +81,21 @@ int shadow_capture_align_clip_rect(RECTANGLE_16* rect, RECTANGLE_16* clip) int shadow_capture_compare(BYTE* pData1, UINT32 nStep1, UINT32 nWidth, UINT32 nHeight, BYTE* pData2, UINT32 nStep2, RECTANGLE_16* rect) { - BOOL equal; - BOOL allEqual; - UINT32 tw; - UINT32 th; - UINT32 tx; - UINT32 ty; - UINT32 k; - UINT32 nrow; - UINT32 ncol; - UINT32 l; - UINT32 t; - UINT32 r; - UINT32 b; - BYTE* p1; - BYTE* p2; + BOOL equal = 0; + BOOL allEqual = 0; + UINT32 tw = 0; + UINT32 th = 0; + UINT32 tx = 0; + UINT32 ty = 0; + UINT32 k = 0; + UINT32 nrow = 0; + UINT32 ncol = 0; + UINT32 l = 0; + UINT32 t = 0; + UINT32 r = 0; + UINT32 b = 0; + BYTE* p1 = NULL; + BYTE* p2 = NULL; BOOL rows[1024]; #ifdef WITH_DEBUG_SHADOW_CAPTURE BOOL cols[1024] = { FALSE }; diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c index 8ff284585..9f8695aa5 100644 --- a/server/shadow/shadow_client.c +++ b/server/shadow/shadow_client.c @@ -47,8 +47,8 @@ static INLINE BOOL shadow_client_rdpgfx_new_surface(rdpShadowClient* client) UINT error = CHANNEL_RC_OK; RDPGFX_CREATE_SURFACE_PDU createSurface; RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU surfaceToOutput; - RdpgfxServerContext* context; - rdpSettings* settings; + RdpgfxServerContext* context = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(client); context = client->rdpgfx; @@ -89,7 +89,7 @@ static INLINE BOOL shadow_client_rdpgfx_release_surface(rdpShadowClient* client) { UINT error = CHANNEL_RC_OK; RDPGFX_DELETE_SURFACE_PDU pdu; - RdpgfxServerContext* context; + RdpgfxServerContext* context = NULL; WINPR_ASSERT(client); @@ -112,8 +112,8 @@ static INLINE BOOL shadow_client_rdpgfx_reset_graphic(rdpShadowClient* client) { UINT error = CHANNEL_RC_OK; RDPGFX_RESET_GRAPHICS_PDU pdu = { 0 }; - RdpgfxServerContext* context; - rdpSettings* settings; + RdpgfxServerContext* context = NULL; + rdpSettings* settings = NULL; WINPR_ASSERT(client); WINPR_ASSERT(client->rdpgfx); @@ -155,7 +155,7 @@ static INLINE void shadow_client_free_queued_message(void* obj) static void shadow_client_context_free(freerdp_peer* peer, rdpContext* context) { rdpShadowClient* client = (rdpShadowClient*)context; - rdpShadowServer* server; + rdpShadowServer* server = NULL; WINPR_UNUSED(peer); if (!client) @@ -180,12 +180,12 @@ static void shadow_client_context_free(freerdp_peer* peer, rdpContext* context) static BOOL shadow_client_context_new(freerdp_peer* peer, rdpContext* context) { - BOOL NSCodec; + BOOL NSCodec = 0; const char bind_address[] = "bind-address,"; rdpShadowClient* client = (rdpShadowClient*)context; - rdpSettings* settings; - const rdpSettings* srvSettings; - rdpShadowServer* server; + rdpSettings* settings = NULL; + const rdpSettings* srvSettings = NULL; + rdpShadowServer* server = NULL; const wObject cb = { NULL, NULL, NULL, shadow_client_free_queued_message, NULL }; WINPR_ASSERT(client); @@ -276,9 +276,9 @@ fail: static INLINE void shadow_client_mark_invalid(rdpShadowClient* client, UINT32 numRects, const RECTANGLE_16* rects) { - UINT32 index; + UINT32 index = 0; RECTANGLE_16 screenRegion; - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_ASSERT(client); WINPR_ASSERT(rects || (numRects == 0)); @@ -318,10 +318,10 @@ static INLINE void shadow_client_mark_invalid(rdpShadowClient* client, UINT32 nu */ static INLINE BOOL shadow_client_recalc_desktop_size(rdpShadowClient* client) { - INT32 width; - INT32 height; - rdpShadowServer* server; - rdpSettings* settings; + INT32 width = 0; + INT32 height = 0; + rdpShadowServer* server = NULL; + rdpSettings* settings = NULL; RECTANGLE_16 viewport = { 0 }; WINPR_ASSERT(client); @@ -358,8 +358,8 @@ static INLINE BOOL shadow_client_recalc_desktop_size(rdpShadowClient* client) static BOOL shadow_client_capabilities(freerdp_peer* peer) { - rdpShadowSubsystem* subsystem; - rdpShadowClient* client; + rdpShadowSubsystem* subsystem = NULL; + rdpShadowClient* client = NULL; BOOL ret = TRUE; WINPR_ASSERT(peer); @@ -387,10 +387,10 @@ static void shadow_reset_desktop_resize(rdpShadowClient* client) static BOOL shadow_send_desktop_resize(rdpShadowClient* client) { - BOOL rc; - rdpUpdate* update; - rdpSettings* settings; - const freerdp_peer* peer; + BOOL rc = 0; + rdpUpdate* update = NULL; + rdpSettings* settings = NULL; + const freerdp_peer* peer = NULL; WINPR_ASSERT(client); @@ -440,11 +440,11 @@ static BOOL shadow_send_desktop_resize(rdpShadowClient* client) static BOOL shadow_client_post_connect(freerdp_peer* peer) { - int authStatus; - rdpSettings* settings; - rdpShadowClient* client; - rdpShadowServer* server; - rdpShadowSubsystem* subsystem; + int authStatus = 0; + rdpSettings* settings = NULL; + rdpShadowClient* client = NULL; + rdpShadowServer* server = NULL; + rdpShadowSubsystem* subsystem = NULL; WINPR_ASSERT(peer); @@ -557,7 +557,7 @@ static INLINE void shadow_client_convert_rects(rdpShadowClient* client, RECTANGL static BOOL shadow_client_refresh_request(rdpShadowClient* client) { wMessage message = { 0 }; - wMessagePipe* MsgPipe; + wMessagePipe* MsgPipe = NULL; WINPR_ASSERT(client); WINPR_ASSERT(client->subsystem); @@ -576,7 +576,7 @@ static BOOL shadow_client_refresh_request(rdpShadowClient* client) static BOOL shadow_client_refresh_rect(rdpContext* context, BYTE count, const RECTANGLE_16* areas) { rdpShadowClient* client = (rdpShadowClient*)context; - RECTANGLE_16* rects; + RECTANGLE_16* rects = NULL; /* It is invalid if we have area count but no actual area */ if (count && !areas) @@ -630,8 +630,8 @@ static BOOL shadow_client_suppress_output(rdpContext* context, BYTE allow, const static BOOL shadow_client_activate(freerdp_peer* peer) { - rdpSettings* settings; - rdpShadowClient* client; + rdpSettings* settings = NULL; + rdpShadowClient* client = NULL; WINPR_ASSERT(peer); @@ -666,7 +666,7 @@ static BOOL shadow_client_logon(freerdp_peer* peer, const SEC_WINNT_AUTH_IDENTIT char* user = NULL; char* domain = NULL; char* password = NULL; - rdpSettings* settings; + rdpSettings* settings = NULL; WINPR_UNUSED(automatic); @@ -754,7 +754,7 @@ static UINT shadow_client_rdpgfx_frame_acknowledge(RdpgfxServerContext* context, const RDPGFX_FRAME_ACKNOWLEDGE_PDU* frameAcknowledge) { - rdpShadowClient* client; + rdpShadowClient* client = NULL; WINPR_ASSERT(context); WINPR_ASSERT(frameAcknowledge); @@ -806,9 +806,9 @@ static BOOL shadow_client_caps_test_version(RdpgfxServerContext* context, rdpSha BOOL h264, const RDPGFX_CAPSET* capsSets, UINT32 capsSetCount, UINT32 capsVersion, UINT* rc) { - UINT32 index; - const rdpSettings* srvSettings; - rdpSettings* clientSettings; + UINT32 index = 0; + const rdpSettings* srvSettings = NULL; + rdpSettings* clientSettings = NULL; WINPR_ASSERT(context); WINPR_ASSERT(client); @@ -831,7 +831,7 @@ static BOOL shadow_client_caps_test_version(RdpgfxServerContext* context, rdpSha if (currentCaps->version == capsVersion) { - UINT32 flags; + UINT32 flags = 0; BOOL planar = FALSE; BOOL rfx = FALSE; BOOL avc444v2 = FALSE; @@ -896,10 +896,10 @@ static BOOL shadow_client_caps_test_version(RdpgfxServerContext* context, rdpSha static UINT shadow_client_rdpgfx_caps_advertise(RdpgfxServerContext* context, const RDPGFX_CAPS_ADVERTISE_PDU* capsAdvertise) { - UINT16 index; + UINT16 index = 0; UINT rc = ERROR_INTERNAL_ERROR; - const rdpSettings* srvSettings; - rdpSettings* clientSettings; + const rdpSettings* srvSettings = NULL; + rdpSettings* clientSettings = NULL; BOOL h264 = FALSE; UINT32 flags = 0; @@ -1056,11 +1056,11 @@ static BOOL shadow_client_send_surface_gfx(rdpShadowClient* client, const BYTE* UINT32 nSrcStep, UINT32 SrcFormat, UINT16 nXSrc, UINT16 nYSrc, UINT16 nWidth, UINT16 nHeight) { - UINT32 id; + UINT32 id = 0; UINT error = CHANNEL_RC_OK; const rdpContext* context = (const rdpContext*)client; - const rdpSettings* settings; - rdpShadowEncoder* encoder; + const rdpSettings* settings = NULL; + rdpShadowEncoder* encoder = NULL; RDPGFX_SURFACE_COMMAND cmd = { 0 }; RDPGFX_START_FRAME_PDU cmdstart = { 0 }; RDPGFX_END_FRAME_PDU cmdend = { 0 }; @@ -1102,7 +1102,7 @@ static BOOL shadow_client_send_surface_gfx(rdpShadowClient* client, const BYTE* const BOOL GfxAVC444v2 = freerdp_settings_get_bool(settings, FreeRDP_GfxAVC444v2); if (GfxAVC444 || GfxAVC444v2) { - INT32 rc; + INT32 rc = 0; RDPGFX_AVC444_BITMAP_STREAM avc444 = { 0 }; RECTANGLE_16 regionRect = { 0 }; BYTE version = GfxAVC444v2 ? 2 : 1; @@ -1152,7 +1152,7 @@ static BOOL shadow_client_send_surface_gfx(rdpShadowClient* client, const BYTE* } else if (GfxH264) { - INT32 rc; + INT32 rc = 0; RDPGFX_AVC420_BITMAP_STREAM avc420 = { 0 }; RECTANGLE_16 regionRect; @@ -1199,8 +1199,8 @@ static BOOL shadow_client_send_surface_gfx(rdpShadowClient* client, const BYTE* #endif if (freerdp_settings_get_bool(settings, FreeRDP_RemoteFxCodec) && (id != 0)) { - BOOL rc; - wStream* s; + BOOL rc = 0; + wStream* s = NULL; RFX_RECT rect; if (shadow_encoder_prepare(encoder, FREERDP_CODEC_REMOTEFX) < 0) @@ -1253,7 +1253,7 @@ static BOOL shadow_client_send_surface_gfx(rdpShadowClient* client, const BYTE* } else if (freerdp_settings_get_bool(settings, FreeRDP_GfxProgressive)) { - INT32 rc; + INT32 rc = 0; REGION16 region; RECTANGLE_16 regionRect; @@ -1299,7 +1299,7 @@ static BOOL shadow_client_send_surface_gfx(rdpShadowClient* client, const BYTE* } else if (freerdp_settings_get_bool(settings, FreeRDP_GfxPlanar)) { - BOOL rc; + BOOL rc = 0; const UINT32 w = cmd.right - cmd.left; const UINT32 h = cmd.bottom - cmd.top; const BYTE* src = @@ -1331,7 +1331,7 @@ static BOOL shadow_client_send_surface_gfx(rdpShadowClient* client, const BYTE* } else { - BOOL rc; + BOOL rc = 0; const UINT32 w = cmd.right - cmd.left; const UINT32 h = cmd.bottom - cmd.top; const UINT32 length = w * 4 * h; @@ -1369,18 +1369,18 @@ static BOOL shadow_client_send_surface_bits(rdpShadowClient* client, BYTE* pSrcD UINT16 nWidth, UINT16 nHeight) { BOOL ret = TRUE; - BOOL first; - BOOL last; - wStream* s; - size_t numMessages; + BOOL first = 0; + BOOL last = 0; + wStream* s = NULL; + size_t numMessages = 0; UINT32 frameId = 0; - rdpUpdate* update; + rdpUpdate* update = NULL; rdpContext* context = (rdpContext*)client; - rdpSettings* settings; - rdpShadowEncoder* encoder; + rdpSettings* settings = NULL; + rdpShadowEncoder* encoder = NULL; SURFACE_BITS_COMMAND cmd = { 0 }; - UINT32 nsID; - UINT32 rfxID; + UINT32 nsID = 0; + UINT32 rfxID = 0; if (!context || !pSrcData) return FALSE; @@ -1527,24 +1527,24 @@ static BOOL shadow_client_send_bitmap_update(rdpShadowClient* client, BYTE* pSrc UINT16 nWidth, UINT16 nHeight) { BOOL ret = TRUE; - BYTE* data; - BYTE* buffer; - UINT32 k; - UINT32 yIdx; - UINT32 xIdx; - UINT32 rows; - UINT32 cols; - UINT32 DstSize; - UINT32 SrcFormat; - BITMAP_DATA* bitmap; - rdpUpdate* update; + BYTE* data = NULL; + BYTE* buffer = NULL; + UINT32 k = 0; + UINT32 yIdx = 0; + UINT32 xIdx = 0; + UINT32 rows = 0; + UINT32 cols = 0; + UINT32 DstSize = 0; + UINT32 SrcFormat = 0; + BITMAP_DATA* bitmap = NULL; + rdpUpdate* update = NULL; rdpContext* context = (rdpContext*)client; - rdpSettings* settings; - UINT32 totalBitmapSize; - UINT32 updateSizeEstimate; - BITMAP_DATA* bitmapData; + rdpSettings* settings = NULL; + UINT32 totalBitmapSize = 0; + UINT32 updateSizeEstimate = 0; + BITMAP_DATA* bitmapData = NULL; BITMAP_UPDATE bitmapUpdate; - rdpShadowEncoder* encoder; + rdpShadowEncoder* encoder = NULL; if (!context || !pSrcData) return FALSE; @@ -1650,7 +1650,7 @@ static BOOL shadow_client_send_bitmap_update(rdpShadowClient* client, BYTE* pSrc } else { - UINT32 dstSize; + UINT32 dstSize = 0; buffer = encoder->grid[k]; data = &pSrcData[(bitmap->destTop * nSrcStep) + (bitmap->destLeft * 4)]; @@ -1676,10 +1676,10 @@ static BOOL shadow_client_send_bitmap_update(rdpShadowClient* client, BYTE* pSrc if (updateSizeEstimate > maxUpdateSize) { - UINT32 i; - UINT32 j; - UINT32 updateSize; - UINT32 newUpdateSize; + UINT32 i = 0; + UINT32 j = 0; + UINT32 updateSize = 0; + UINT32 newUpdateSize = 0; BITMAP_DATA* fragBitmapData = NULL; if (k > 0) @@ -1747,23 +1747,23 @@ out: static BOOL shadow_client_send_surface_update(rdpShadowClient* client, SHADOW_GFX_STATUS* pStatus) { BOOL ret = TRUE; - INT64 nXSrc; - INT64 nYSrc; - INT64 nWidth; - INT64 nHeight; + INT64 nXSrc = 0; + INT64 nYSrc = 0; + INT64 nWidth = 0; + INT64 nHeight = 0; rdpContext* context = (rdpContext*)client; - rdpSettings* settings; - rdpShadowServer* server; - rdpShadowSurface* surface; + rdpSettings* settings = NULL; + rdpShadowServer* server = NULL; + rdpShadowSurface* surface = NULL; REGION16 invalidRegion; RECTANGLE_16 surfaceRect; - const RECTANGLE_16* extents; - BYTE* pSrcData; - UINT32 nSrcStep; - UINT32 SrcFormat; - UINT32 index; + const RECTANGLE_16* extents = NULL; + BYTE* pSrcData = NULL; + UINT32 nSrcStep = 0; + UINT32 SrcFormat = 0; + UINT32 index = 0; UINT32 numRects = 0; - const RECTANGLE_16* rects; + const RECTANGLE_16* rects = NULL; if (!context || !pStatus) return FALSE; @@ -1822,8 +1822,8 @@ static BOOL shadow_client_send_surface_update(rdpShadowClient* client, SHADOW_GF /* Move to new pSrcData / nXSrc / nYSrc according to sub rect */ if (server->shareSubRect) { - INT32 subX; - INT32 subY; + INT32 subX = 0; + INT32 subY = 0; subX = server->subRect.left; subY = server->subRect.top; nXSrc -= subX; @@ -1916,8 +1916,8 @@ out: static BOOL shadow_client_send_resize(rdpShadowClient* client, SHADOW_GFX_STATUS* pStatus) { rdpContext* context = (rdpContext*)client; - rdpSettings* settings; - freerdp_peer* peer; + rdpSettings* settings = NULL; + freerdp_peer* peer = NULL; if (!context || !pStatus) return FALSE; @@ -1965,7 +1965,7 @@ static BOOL shadow_client_send_resize(rdpShadowClient* client, SHADOW_GFX_STATUS static BOOL shadow_client_surface_update(rdpShadowClient* client, REGION16* region) { UINT32 numRects = 0; - const RECTANGLE_16* rects; + const RECTANGLE_16* rects = NULL; rects = region16_rects(region, &numRects); shadow_client_mark_invalid(client, numRects, rects); return TRUE; @@ -1980,8 +1980,8 @@ static BOOL shadow_client_surface_update(rdpShadowClient* client, REGION16* regi static INLINE BOOL shadow_client_no_surface_update(rdpShadowClient* client, SHADOW_GFX_STATUS* pStatus) { - rdpShadowServer* server; - rdpShadowSurface* surface; + rdpShadowServer* server = NULL; + rdpShadowSurface* surface = NULL; WINPR_UNUSED(pStatus); WINPR_ASSERT(client); server = client->server; @@ -1993,7 +1993,7 @@ static INLINE BOOL shadow_client_no_surface_update(rdpShadowClient* client, static int shadow_client_subsystem_process_message(rdpShadowClient* client, wMessage* message) { rdpContext* context = (rdpContext*)client; - rdpUpdate* update; + rdpUpdate* update = NULL; WINPR_ASSERT(message); WINPR_ASSERT(context); @@ -2463,8 +2463,8 @@ out: BOOL shadow_client_accepted(freerdp_listener* listener, freerdp_peer* peer) { - rdpShadowClient* client; - rdpShadowServer* server; + rdpShadowClient* client = NULL; + rdpShadowServer* server = NULL; if (!listener || !peer) return FALSE; @@ -2500,7 +2500,7 @@ BOOL shadow_client_accepted(freerdp_listener* listener, freerdp_peer* peer) static void shadow_msg_out_addref(wMessage* message) { - SHADOW_MSG_OUT* msg; + SHADOW_MSG_OUT* msg = NULL; WINPR_ASSERT(message); msg = (SHADOW_MSG_OUT*)message->wParam; @@ -2511,7 +2511,7 @@ static void shadow_msg_out_addref(wMessage* message) static void shadow_msg_out_release(wMessage* message) { - SHADOW_MSG_OUT* msg; + SHADOW_MSG_OUT* msg = NULL; WINPR_ASSERT(message); msg = (SHADOW_MSG_OUT*)message->wParam; diff --git a/server/shadow/shadow_encoder.c b/server/shadow/shadow_encoder.c index 55dd905e0..1ecc43e3e 100644 --- a/server/shadow/shadow_encoder.c +++ b/server/shadow/shadow_encoder.c @@ -51,7 +51,7 @@ UINT32 shadow_encoder_inflight_frames(rdpShadowEncoder* encoder) UINT32 shadow_encoder_create_frame_id(rdpShadowEncoder* encoder) { - UINT32 frameId; + UINT32 frameId = 0; UINT32 inFlightFrames = shadow_encoder_inflight_frames(encoder); /* @@ -80,11 +80,11 @@ UINT32 shadow_encoder_create_frame_id(rdpShadowEncoder* encoder) static int shadow_encoder_init_grid(rdpShadowEncoder* encoder) { - UINT32 i; - UINT32 j; - UINT32 k; - UINT32 tileSize; - UINT32 tileCount; + UINT32 i = 0; + UINT32 j = 0; + UINT32 k = 0; + UINT32 tileSize = 0; + UINT32 tileCount = 0; encoder->gridWidth = ((encoder->width + (encoder->maxTileWidth - 1)) / encoder->maxTileWidth); encoder->gridHeight = ((encoder->height + (encoder->maxTileHeight - 1)) / encoder->maxTileHeight); @@ -401,7 +401,7 @@ static int shadow_encoder_uninit(rdpShadowEncoder* encoder) int shadow_encoder_reset(rdpShadowEncoder* encoder) { - int status; + int status = 0; UINT32 codecs = encoder->codecs; rdpContext* context = (rdpContext*)encoder->client; rdpSettings* settings = context->settings; @@ -430,7 +430,7 @@ int shadow_encoder_reset(rdpShadowEncoder* encoder) int shadow_encoder_prepare(rdpShadowEncoder* encoder, UINT32 codecs) { - int status; + int status = 0; if ((codecs & FREERDP_CODEC_REMOTEFX) && !(encoder->codecs & FREERDP_CODEC_REMOTEFX)) { @@ -492,7 +492,7 @@ int shadow_encoder_prepare(rdpShadowEncoder* encoder, UINT32 codecs) rdpShadowEncoder* shadow_encoder_new(rdpShadowClient* client) { - rdpShadowEncoder* encoder; + rdpShadowEncoder* encoder = NULL; rdpShadowServer* server = client->server; encoder = (rdpShadowEncoder*)calloc(1, sizeof(rdpShadowEncoder)); diff --git a/server/shadow/shadow_encomsp.c b/server/shadow/shadow_encomsp.c index 547cbd3e1..8a3a46836 100644 --- a/server/shadow/shadow_encomsp.c +++ b/server/shadow/shadow_encomsp.c @@ -36,9 +36,9 @@ static UINT encomsp_change_participant_control_level(EncomspServerContext* context, ENCOMSP_CHANGE_PARTICIPANT_CONTROL_LEVEL_PDU* pdu) { - BOOL inLobby; - BOOL mayView; - BOOL mayInteract; + BOOL inLobby = 0; + BOOL mayView = 0; + BOOL mayInteract = 0; rdpShadowClient* client = (rdpShadowClient*)context->custom; WLog_INFO(TAG, @@ -102,7 +102,7 @@ encomsp_change_participant_control_level(EncomspServerContext* context, int shadow_client_encomsp_init(rdpShadowClient* client) { - EncomspServerContext* encomsp; + EncomspServerContext* encomsp = NULL; encomsp = client->encomsp = encomsp_server_context_new(client->vcm); diff --git a/server/shadow/shadow_lobby.c b/server/shadow/shadow_lobby.c index b84402b71..8a9fade94 100644 --- a/server/shadow/shadow_lobby.c +++ b/server/shadow/shadow_lobby.c @@ -27,10 +27,10 @@ BOOL shadow_client_init_lobby(rdpShadowServer* server) { - int width; - int height; - rdtkEngine* engine; - rdtkSurface* surface; + int width = 0; + int height = 0; + rdtkEngine* engine = NULL; + rdtkSurface* surface = NULL; RECTANGLE_16 invalidRect; rdpShadowSurface* lobby = server->lobby; diff --git a/server/shadow/shadow_mcevent.c b/server/shadow/shadow_mcevent.c index 1821a46fe..e9a524943 100644 --- a/server/shadow/shadow_mcevent.c +++ b/server/shadow/shadow_mcevent.c @@ -108,9 +108,9 @@ void shadow_multiclient_free(rdpShadowMultiClientEvent* event) static void _Publish(rdpShadowMultiClientEvent* event) { - wArrayList* subscribers; + wArrayList* subscribers = NULL; struct rdp_shadow_multiclient_subscriber* subscriber = NULL; - size_t i; + size_t i = 0; subscribers = event->subscribers; @@ -253,7 +253,7 @@ static BOOL _Consume(struct rdp_shadow_multiclient_subscriber* subscriber, BOOL void* shadow_multiclient_get_subscriber(rdpShadowMultiClientEvent* event) { - struct rdp_shadow_multiclient_subscriber* subscriber; + struct rdp_shadow_multiclient_subscriber* subscriber = NULL; if (!event) return NULL; @@ -296,8 +296,8 @@ out_error: */ void shadow_multiclient_release_subscriber(void* subscriber) { - struct rdp_shadow_multiclient_subscriber* s; - rdpShadowMultiClientEvent* event; + struct rdp_shadow_multiclient_subscriber* s = NULL; + rdpShadowMultiClientEvent* event = NULL; if (!subscriber) return; @@ -324,8 +324,8 @@ void shadow_multiclient_release_subscriber(void* subscriber) BOOL shadow_multiclient_consume(void* subscriber) { - struct rdp_shadow_multiclient_subscriber* s; - rdpShadowMultiClientEvent* event; + struct rdp_shadow_multiclient_subscriber* s = NULL; + rdpShadowMultiClientEvent* event = NULL; BOOL ret = FALSE; if (!subscriber) diff --git a/server/shadow/shadow_rdpsnd.c b/server/shadow/shadow_rdpsnd.c index fa6c7e38b..16899e477 100644 --- a/server/shadow/shadow_rdpsnd.c +++ b/server/shadow/shadow_rdpsnd.c @@ -48,7 +48,7 @@ static void rdpsnd_activated(RdpsndServerContext* context) int shadow_client_rdpsnd_init(rdpShadowClient* client) { - RdpsndServerContext* rdpsnd; + RdpsndServerContext* rdpsnd = NULL; rdpsnd = client->rdpsnd = rdpsnd_server_context_new(client->vcm); if (!rdpsnd) diff --git a/server/shadow/shadow_remdesk.c b/server/shadow/shadow_remdesk.c index 752d92372..19fb9f36e 100644 --- a/server/shadow/shadow_remdesk.c +++ b/server/shadow/shadow_remdesk.c @@ -26,7 +26,7 @@ int shadow_client_remdesk_init(rdpShadowClient* client) { - RemdeskServerContext* remdesk; + RemdeskServerContext* remdesk = NULL; remdesk = client->remdesk = remdesk_server_context_new(client->vcm); remdesk->rdpcontext = &client->context; diff --git a/server/shadow/shadow_screen.c b/server/shadow/shadow_screen.c index c6be52239..8a9e0b304 100644 --- a/server/shadow/shadow_screen.c +++ b/server/shadow/shadow_screen.c @@ -119,12 +119,12 @@ void shadow_screen_free(rdpShadowScreen* screen) BOOL shadow_screen_resize(rdpShadowScreen* screen) { - int x; - int y; - int width; - int height; - MONITOR_DEF* primary; - rdpShadowSubsystem* subsystem; + int x = 0; + int y = 0; + int width = 0; + int height = 0; + MONITOR_DEF* primary = NULL; + rdpShadowSubsystem* subsystem = NULL; if (!screen) return FALSE; diff --git a/server/shadow/shadow_server.c b/server/shadow/shadow_server.c index b14ed0da8..653c77995 100644 --- a/server/shadow/shadow_server.c +++ b/server/shadow/shadow_server.c @@ -47,9 +47,9 @@ static const char bind_address[] = "bind-address,"; static int shadow_server_print_command_line_help(int argc, char** argv, COMMAND_LINE_ARGUMENT_A* largs) { - char* str; - size_t length; - const COMMAND_LINE_ARGUMENT_A* arg; + char* str = NULL; + size_t length = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; if ((argc < 1) || !largs || !argv) return -1; @@ -146,9 +146,9 @@ int shadow_server_command_line_status_print(rdpShadowServer* server, int argc, c int shadow_server_parse_command_line(rdpShadowServer* server, int argc, char** argv, COMMAND_LINE_ARGUMENT_A* cargs) { - int status; - DWORD flags; - const COMMAND_LINE_ARGUMENT_A* arg; + int status = 0; + DWORD flags = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; rdpSettings* settings = server->settings; if ((argc < 2) || !argv || !cargs) @@ -191,7 +191,7 @@ int shadow_server_parse_command_line(rdpShadowServer* server, int argc, char** a } CommandLineSwitchCase(arg, "bind-address") { - int rc; + int rc = 0; size_t len = strlen(arg->Value) + sizeof(bind_address); /* /ipc-socket is incompatible */ if (server->ipcSocket) @@ -224,7 +224,7 @@ int shadow_server_parse_command_line(rdpShadowServer* server, int argc, char** a } CommandLineSwitchCase(arg, "rect") { - char* p; + char* p = NULL; char* tok[4]; long x = -1; long y = -1; @@ -459,8 +459,8 @@ int shadow_server_parse_command_line(rdpShadowServer* server, int argc, char** a if (arg && (arg->Flags & COMMAND_LINE_ARGUMENT_PRESENT)) { - UINT32 index; - UINT32 numMonitors; + UINT32 index = 0; + UINT32 numMonitors = 0; MONITOR_DEF monitors[16] = { 0 }; numMonitors = shadow_enum_monitors(monitors, 16); @@ -507,7 +507,7 @@ static DWORD WINAPI shadow_server_thread(LPVOID arg) { rdpShadowServer* server = (rdpShadowServer*)arg; BOOL running = TRUE; - DWORD status; + DWORD status = 0; freerdp_listener* listener = server->listener; shadow_subsystem_start(server->subsystem); @@ -570,7 +570,7 @@ static DWORD WINAPI shadow_server_thread(LPVOID arg) static BOOL open_port(rdpShadowServer* server, char* address) { - BOOL status; + BOOL status = 0; char* modaddr = address; if (modaddr) @@ -605,8 +605,8 @@ static BOOL open_port(rdpShadowServer* server, char* address) int shadow_server_start(rdpShadowServer* server) { - BOOL ipc; - BOOL status; + BOOL ipc = 0; + BOOL status = 0; WSADATA wsaData; if (!server) @@ -644,8 +644,8 @@ int shadow_server_start(rdpShadowServer* server) strnlen(bind_address, sizeof(bind_address))) != 0); if (!ipc) { - size_t x; - size_t count; + size_t x = 0; + size_t count = 0; char** list = CommandLineParseCommaSeparatedValuesEx(NULL, server->ipcSocket, &count); if (!list || (count <= 1)) { @@ -777,7 +777,7 @@ static int shadow_server_init_config_path(rdpShadowServer* server) if (!server->ConfigPath) { - char* configHome; + char* configHome = NULL; configHome = GetKnownPath(KNOWN_PATH_XDG_CONFIG_HOME); if (configHome) @@ -924,7 +924,7 @@ static BOOL shadow_server_check_peer_restrictions(freerdp_listener* listener) int shadow_server_init(rdpShadowServer* server) { - int status; + int status = 0; winpr_InitializeSSL(WINPR_SSL_INIT_DEFAULT); WTSRegisterWtsApiFunctionTable(FreeRDP_InitWtsApi()); @@ -997,7 +997,7 @@ int shadow_server_uninit(rdpShadowServer* server) rdpShadowServer* shadow_server_new(void) { - rdpShadowServer* server; + rdpShadowServer* server = NULL; server = (rdpShadowServer*)calloc(1, sizeof(rdpShadowServer)); if (!server) diff --git a/server/shadow/shadow_subsystem.c b/server/shadow/shadow_subsystem.c index bf2b45ee7..22951354f 100644 --- a/server/shadow/shadow_subsystem.c +++ b/server/shadow/shadow_subsystem.c @@ -124,8 +124,8 @@ void shadow_subsystem_uninit(rdpShadowSubsystem* subsystem) if (subsystem->MsgPipe) { - wObject* obj1; - wObject* obj2; + wObject* obj1 = NULL; + wObject* obj2 = NULL; /* Release resource in messages before free */ obj1 = MessageQueue_Object(subsystem->MsgPipe->In); @@ -148,7 +148,7 @@ void shadow_subsystem_uninit(rdpShadowSubsystem* subsystem) int shadow_subsystem_start(rdpShadowSubsystem* subsystem) { - int status; + int status = 0; if (!subsystem || !subsystem->ep.Start) return -1; @@ -160,7 +160,7 @@ int shadow_subsystem_start(rdpShadowSubsystem* subsystem) int shadow_subsystem_stop(rdpShadowSubsystem* subsystem) { - int status; + int status = 0; if (!subsystem || !subsystem->ep.Stop) return -1; @@ -193,19 +193,19 @@ int shadow_subsystem_pointer_convert_alpha_pointer_data( BYTE* pixels, BOOL premultiplied, UINT32 width, UINT32 height, SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE* pointerColor) { - UINT32 x; - UINT32 y; - BYTE* pSrc8; - BYTE* pDst8; - UINT32 xorStep; - UINT32 andStep; - UINT32 andBit; - BYTE* andBits; - UINT32 andPixel; - BYTE A; - BYTE R; - BYTE G; - BYTE B; + UINT32 x = 0; + UINT32 y = 0; + BYTE* pSrc8 = NULL; + BYTE* pDst8 = NULL; + UINT32 xorStep = 0; + UINT32 andStep = 0; + UINT32 andBit = 0; + BYTE* andBits = NULL; + UINT32 andPixel = 0; + BYTE A = 0; + BYTE R = 0; + BYTE G = 0; + BYTE B = 0; xorStep = (width * 3); xorStep += (xorStep % 2); diff --git a/server/shadow/shadow_surface.c b/server/shadow/shadow_surface.c index 599e290c0..16aeccef1 100644 --- a/server/shadow/shadow_surface.c +++ b/server/shadow/shadow_surface.c @@ -27,7 +27,7 @@ rdpShadowSurface* shadow_surface_new(rdpShadowServer* server, UINT16 x, UINT16 y, UINT32 width, UINT32 height) { - rdpShadowSurface* surface; + rdpShadowSurface* surface = NULL; surface = (rdpShadowSurface*)calloc(1, sizeof(rdpShadowSurface)); if (!surface) diff --git a/uwac/libuwac/uwac-clipboard.c b/uwac/libuwac/uwac-clipboard.c index 9fb3d9acb..216d70a23 100644 --- a/uwac/libuwac/uwac-clipboard.c +++ b/uwac/libuwac/uwac-clipboard.c @@ -138,8 +138,7 @@ static UwacReturnCode UwacCreateDataSource(UwacSeat* s) UwacReturnCode UwacSeatRegisterClipboard(UwacSeat* s) { - UwacReturnCode rc; - UwacClipboardEvent* event; + UwacClipboardEvent* event = NULL; if (!s) return UWAC_ERROR_INTERNAL; @@ -149,7 +148,7 @@ UwacReturnCode UwacSeatRegisterClipboard(UwacSeat* s) UwacRegisterDeviceListener(s); - rc = UwacCreateDataSource(s); + UwacReturnCode rc = UwacCreateDataSource(s); if (rc != UWAC_SUCCESS) return rc; @@ -195,7 +194,7 @@ static const struct wl_callback_listener callback_listener = { .done = callback_ static uint32_t get_serial(UwacSeat* s) { - struct wl_callback* callback; + struct wl_callback* callback = NULL; uint32_t serial = 0; callback = wl_display_sync(s->display->display); wl_callback_add_listener(callback, &callback_listener, &serial); @@ -247,7 +246,7 @@ void* UwacClipboardDataGet(UwacSeat* seat, const char* mime, size_t* size) do { - void* tmp; + void* tmp = NULL; alloc += 1024; tmp = xrealloc(data, alloc); if (!tmp) diff --git a/uwac/libuwac/uwac-display.c b/uwac/libuwac/uwac-display.c index 3d61a285a..95353b94c 100644 --- a/uwac/libuwac/uwac-display.c +++ b/uwac/libuwac/uwac-display.c @@ -109,8 +109,8 @@ static const struct zwp_fullscreen_shell_v1_listener fullscreen_shell_listener = static void display_destroy_seat(UwacDisplay* d, uint32_t name) { - UwacSeat* seat; - UwacSeat* tmp; + UwacSeat* seat = NULL; + UwacSeat* tmp = NULL; wl_list_for_each_safe(seat, tmp, &d->seats, link) { if (seat->seat_id == name) @@ -143,7 +143,7 @@ static void registry_handle_global(void* data, struct wl_registry* registry, uin const char* interface, uint32_t version) { UwacDisplay* d = data; - UwacGlobal* global; + UwacGlobal* global = NULL; global = xzalloc(sizeof *global); global->name = id; global->interface = xstrdup(interface); @@ -163,8 +163,8 @@ static void registry_handle_global(void* data, struct wl_registry* registry, uin } else if (strcmp(interface, "wl_output") == 0) { - UwacOutput* output; - UwacOutputNewEvent* ev; + UwacOutput* output = NULL; + UwacOutputNewEvent* ev = NULL; output = UwacCreateOutput(d, id, version); if (!output) @@ -180,8 +180,8 @@ static void registry_handle_global(void* data, struct wl_registry* registry, uin } else if (strcmp(interface, "wl_seat") == 0) { - UwacSeatNewEvent* ev; - UwacSeat* seat; + UwacSeatNewEvent* ev = NULL; + UwacSeat* seat = NULL; seat = UwacSeatNew(d, id, min(version, TARGET_SEAT_INTERFACE)); if (!seat) @@ -205,8 +205,8 @@ static void registry_handle_global(void* data, struct wl_registry* registry, uin } else if (strcmp(interface, "wl_data_device_manager") == 0) { - UwacSeat* seat; - UwacSeat* tmp; + UwacSeat* seat = NULL; + UwacSeat* tmp = NULL; d->data_device_manager = wl_registry_bind(registry, id, &wl_data_device_manager_interface, min(TARGET_DDM_INTERFACE, version)); @@ -277,8 +277,8 @@ static void registry_handle_global(void* data, struct wl_registry* registry, uin static void registry_handle_global_remove(void* data, struct wl_registry* registry, uint32_t name) { UwacDisplay* d = data; - UwacGlobal* global; - UwacGlobal* tmp; + UwacGlobal* global = NULL; + UwacGlobal* tmp = NULL; wl_list_for_each_safe(global, tmp, &d->globals, link) { if (global->name != name) @@ -293,7 +293,7 @@ static void registry_handle_global_remove(void* data, struct wl_registry* regist if (strcmp(global->interface, "wl_seat") == 0) { - UwacSeatRemovedEvent* ev; + UwacSeatRemovedEvent* ev = NULL; display_destroy_seat(d, name); ev = (UwacSeatRemovedEvent*)UwacDisplayNewEvent(d, UWAC_EVENT_REMOVED_SEAT); @@ -345,7 +345,7 @@ static void display_dispatch_events(UwacTask* task, uint32_t events) { UwacDisplay* display = container_of(task, UwacDisplay, dispatch_fd_task); struct epoll_event ep; - int ret; + int ret = 0; display->display_fd_events = events; if ((events & EPOLLERR) || (events & EPOLLHUP)) @@ -385,7 +385,7 @@ static void display_dispatch_events(UwacTask* task, uint32_t events) UwacDisplay* UwacOpenDisplay(const char* name, UwacReturnCode* err) { - UwacDisplay* ret; + UwacDisplay* ret = NULL; ret = (UwacDisplay*)xzalloc(sizeof(*ret)); if (!ret) @@ -460,10 +460,10 @@ out_free: int UwacDisplayDispatch(UwacDisplay* display, int timeout) { - int ret; - int count; - int i; - UwacTask* task; + int ret = 0; + int count = 0; + int i = 0; + UwacTask* task = NULL; struct epoll_event ep[16]; wl_display_dispatch_pending(display->display); @@ -501,15 +501,15 @@ UwacReturnCode UwacDisplayGetLastError(const UwacDisplay* display) UwacReturnCode UwacCloseDisplay(UwacDisplay** pdisplay) { - UwacDisplay* display; - UwacSeat* seat; - UwacSeat* tmpSeat; - UwacWindow* window; - UwacWindow* tmpWindow; - UwacOutput* output; - UwacOutput* tmpOutput; - UwacGlobal* global; - UwacGlobal* tmpGlobal; + UwacDisplay* display = NULL; + UwacSeat* seat = NULL; + UwacSeat* tmpSeat = NULL; + UwacWindow* window = NULL; + UwacWindow* tmpWindow = NULL; + UwacOutput* output = NULL; + UwacOutput* tmpOutput = NULL; + UwacGlobal* global = NULL; + UwacGlobal* tmpGlobal = NULL; assert(pdisplay); display = *pdisplay; @@ -630,8 +630,8 @@ const char* UwacErrorString(UwacReturnCode error) UwacReturnCode UwacDisplayQueryInterfaceVersion(const UwacDisplay* display, const char* name, uint32_t* version) { - const UwacGlobal* global; - const UwacGlobal* tmp; + const UwacGlobal* global = NULL; + const UwacGlobal* tmp = NULL; if (!display) return UWAC_ERROR_INVALID_DISPLAY; @@ -684,8 +684,8 @@ uint32_t UwacDisplayGetNbOutputs(const UwacDisplay* display) const UwacOutput* UwacDisplayGetOutput(UwacDisplay* display, int index) { - int i; - int display_count; + int i = 0; + int display_count = 0; UwacOutput* ret = NULL; if (!display) @@ -730,7 +730,7 @@ UwacReturnCode UwacOutputGetPosition(const UwacOutput* output, UwacPosition* pos UwacEvent* UwacDisplayNewEvent(UwacDisplay* display, int type) { - UwacEventListItem* ret; + UwacEventListItem* ret = NULL; if (!display) { @@ -766,8 +766,8 @@ bool UwacHasEvent(UwacDisplay* display) UwacReturnCode UwacNextEvent(UwacDisplay* display, UwacEvent* event) { - UwacEventListItem* prevItem; - int ret; + UwacEventListItem* prevItem = NULL; + int ret = 0; if (!display) return UWAC_ERROR_INVALID_DISPLAY; diff --git a/uwac/libuwac/uwac-input.c b/uwac/libuwac/uwac-input.c index 1c6a7d1ba..5592d10a6 100644 --- a/uwac/libuwac/uwac-input.c +++ b/uwac/libuwac/uwac-input.c @@ -42,9 +42,9 @@ static struct wl_buffer* create_pointer_buffer(UwacSeat* seat, const void* src, size_t size) { struct wl_buffer* buffer = NULL; - int fd; - void* data; - struct wl_shm_pool* pool; + int fd = 0; + void* data = NULL; + struct wl_shm_pool* pool = NULL; assert(seat); @@ -94,7 +94,7 @@ static const struct wl_buffer_listener buffer_release_listener = { on_buffer_rel static UwacReturnCode set_cursor_image(UwacSeat* seat, uint32_t serial) { struct wl_buffer* buffer = NULL; - struct wl_cursor* cursor; + struct wl_cursor* cursor = NULL; struct wl_cursor_image* image = NULL; struct wl_surface* surface = NULL; int32_t x = 0; @@ -157,7 +157,7 @@ static void keyboard_repeat_func(UwacTask* task, uint32_t events) UwacSeat* input = container_of(task, UwacSeat, repeat_task); assert(input); UwacWindow* window = input->keyboard_focus; - uint64_t exp; + uint64_t exp = 0; if (read(input->repeat_timer_fd, &exp, sizeof exp) != sizeof exp) /* If we change the timer between the fd becoming @@ -167,7 +167,7 @@ static void keyboard_repeat_func(UwacTask* task, uint32_t events) if (window) { - UwacKeyEvent* key; + UwacKeyEvent* key = NULL; key = (UwacKeyEvent*)UwacDisplayNewEvent(input->display, UWAC_EVENT_KEY); if (!key) @@ -185,9 +185,9 @@ static void keyboard_handle_keymap(void* data, struct wl_keyboard* keyboard, uin int fd, uint32_t size) { UwacSeat* input = data; - struct xkb_keymap* keymap; - struct xkb_state* state; - char* map_str; + struct xkb_keymap* keymap = NULL; + struct xkb_state* state = NULL; + char* map_str = NULL; int mapFlags = MAP_SHARED; if (!data) @@ -274,8 +274,8 @@ static void keyboard_handle_leave(void* data, struct wl_keyboard* keyboard, uint struct wl_surface* surface) { struct itimerspec its = { 0 }; - uint32_t* pressedKey; - size_t i; + uint32_t* pressedKey = NULL; + size_t i = 0; UwacSeat* input = (UwacSeat*)data; assert(input); @@ -327,13 +327,13 @@ static int update_key_pressed(UwacSeat* seat, uint32_t key) static int update_key_released(UwacSeat* seat, uint32_t key) { - uint32_t* keyPtr; - size_t toMove; + uint32_t* keyPtr = NULL; + size_t toMove = 0; bool found = false; assert(seat); - size_t i; + size_t i = 0; for (i = 0, keyPtr = seat->pressed_keys.data; i < seat->pressed_keys.size; i++, keyPtr++) { if (*keyPtr == key) @@ -361,13 +361,13 @@ static void keyboard_handle_key(void* data, struct wl_keyboard* keyboard, uint32 assert(input); UwacWindow* window = input->keyboard_focus; - UwacKeyEvent* keyEvent; + UwacKeyEvent* keyEvent = NULL; - uint32_t code; - uint32_t num_syms; + uint32_t code = 0; + uint32_t num_syms = 0; enum wl_keyboard_key_state state = state_w; - const xkb_keysym_t* syms; - xkb_keysym_t sym; + const xkb_keysym_t* syms = NULL; + xkb_keysym_t sym = 0; struct itimerspec its; if (state_w == WL_KEYBOARD_KEY_STATE_PRESSED) @@ -433,8 +433,8 @@ static void keyboard_handle_modifiers(void* data, struct wl_keyboard* keyboard, UwacSeat* input = data; assert(input); - UwacKeyboardModifiersEvent* event; - xkb_mod_mask_t mask; + UwacKeyboardModifiersEvent* event = NULL; + xkb_mod_mask_t mask = 0; /* If we're not using a keymap, then we don't handle PC-style modifiers */ if (!input->xkb.keymap) @@ -518,7 +518,7 @@ static void touch_handle_down(void* data, struct wl_touch* wl_touch, uint32_t se wl_fixed_t y_w) { UwacSeat* seat = data; - UwacTouchDown* tdata; + UwacTouchDown* tdata = NULL; assert(seat); assert(seat->display); @@ -587,7 +587,7 @@ static void touch_handle_up(void* data, struct wl_touch* wl_touch, uint32_t seri int32_t id) { UwacSeat* seat = data; - UwacTouchUp* tdata; + UwacTouchUp* tdata = NULL; assert(seat); @@ -632,7 +632,7 @@ static void touch_handle_motion(void* data, struct wl_touch* wl_touch, uint32_t UwacSeat* seat = data; assert(seat); - UwacTouchMotion* tdata; + UwacTouchMotion* tdata = NULL; if (!seat->touch_frame_started && !touch_send_start_frame(seat)) return; @@ -752,8 +752,8 @@ static void pointer_handle_enter(void* data, struct wl_pointer* pointer, uint32_ struct wl_surface* surface, wl_fixed_t sx_w, wl_fixed_t sy_w) { UwacSeat* input = data; - UwacWindow* window; - UwacPointerEnterLeaveEvent* event; + UwacWindow* window = NULL; + UwacPointerEnterLeaveEvent* event = NULL; assert(input); @@ -792,8 +792,8 @@ static void pointer_handle_enter(void* data, struct wl_pointer* pointer, uint32_ static void pointer_handle_leave(void* data, struct wl_pointer* pointer, uint32_t serial, struct wl_surface* surface) { - UwacPointerEnterLeaveEvent* event; - UwacWindow* window; + UwacPointerEnterLeaveEvent* event = NULL; + UwacWindow* window = NULL; UwacSeat* input = data; assert(input); @@ -813,7 +813,7 @@ static void pointer_handle_leave(void* data, struct wl_pointer* pointer, uint32_ static void pointer_handle_motion(void* data, struct wl_pointer* pointer, uint32_t time, wl_fixed_t sx_w, wl_fixed_t sy_w) { - UwacPointerMotionEvent* motion_event; + UwacPointerMotionEvent* motion_event = NULL; UwacSeat* input = data; assert(input); @@ -845,7 +845,7 @@ static void pointer_handle_motion(void* data, struct wl_pointer* pointer, uint32 static void pointer_handle_button(void* data, struct wl_pointer* pointer, uint32_t serial, uint32_t time, uint32_t button, uint32_t state_w) { - UwacPointerButtonEvent* event; + UwacPointerButtonEvent* event = NULL; UwacSeat* seat = data; assert(seat); @@ -868,7 +868,7 @@ static void pointer_handle_button(void* data, struct wl_pointer* pointer, uint32 static void pointer_handle_axis(void* data, struct wl_pointer* pointer, uint32_t time, uint32_t axis, wl_fixed_t value) { - UwacPointerAxisEvent* event; + UwacPointerAxisEvent* event = NULL; UwacSeat* seat = data; assert(seat); @@ -891,7 +891,7 @@ static void pointer_handle_axis(void* data, struct wl_pointer* pointer, uint32_t static void pointer_frame(void* data, struct wl_pointer* wl_pointer) { - UwacPointerFrameEvent* event; + UwacPointerFrameEvent* event = NULL; UwacSeat* seat = data; assert(seat); @@ -910,7 +910,7 @@ static void pointer_frame(void* data, struct wl_pointer* wl_pointer) static void pointer_axis_source(void* data, struct wl_pointer* wl_pointer, uint32_t axis_source) { - UwacPointerSourceEvent* event; + UwacPointerSourceEvent* event = NULL; UwacSeat* seat = data; assert(seat); @@ -939,7 +939,7 @@ static void pointer_axis_discrete(void* data, struct wl_pointer* wl_pointer, uin int32_t discrete) { /*UwacSeat *seat = data;*/ - UwacPointerAxisEvent* event; + UwacPointerAxisEvent* event = NULL; UwacSeat* seat = data; assert(seat); @@ -965,7 +965,7 @@ static void pointer_axis_value120(void* data, struct wl_pointer* wl_pointer, uin int32_t value120) { /*UwacSeat *seat = data;*/ - UwacPointerAxisEvent* event; + UwacPointerAxisEvent* event = NULL; UwacSeat* seat = data; assert(seat); diff --git a/uwac/libuwac/uwac-os.c b/uwac/libuwac/uwac-os.c index 58a8c1ddd..7dd7cb747 100644 --- a/uwac/libuwac/uwac-os.c +++ b/uwac/libuwac/uwac-os.c @@ -67,7 +67,7 @@ static int set_cloexec_or_close(int fd) { - long flags; + long flags = 0; if (fd == -1) return -1; @@ -88,7 +88,7 @@ err: int uwac_os_socket_cloexec(int domain, int type, int protocol) { - int fd; + int fd = 0; fd = socket(domain, type | SOCK_CLOEXEC, protocol); if (fd >= 0) @@ -103,7 +103,7 @@ int uwac_os_socket_cloexec(int domain, int type, int protocol) int uwac_os_dupfd_cloexec(int fd, long minfd) { - int newfd; + int newfd = 0; newfd = fcntl(fd, F_DUPFD_CLOEXEC, minfd); if (newfd >= 0) @@ -118,11 +118,11 @@ int uwac_os_dupfd_cloexec(int fd, long minfd) static ssize_t recvmsg_cloexec_fallback(int sockfd, struct msghdr* msg, int flags) { - ssize_t len; - struct cmsghdr* cmsg; - unsigned char* data; - int* fd; - int* end; + ssize_t len = 0; + struct cmsghdr* cmsg = NULL; + unsigned char* data = NULL; + int* fd = NULL; + int* end = NULL; len = recvmsg(sockfd, msg, flags); if (len == -1) @@ -150,7 +150,7 @@ static ssize_t recvmsg_cloexec_fallback(int sockfd, struct msghdr* msg, int flag ssize_t uwac_os_recvmsg_cloexec(int sockfd, struct msghdr* msg, int flags) { - ssize_t len; + ssize_t len = 0; len = recvmsg(sockfd, msg, flags | MSG_CMSG_CLOEXEC); if (len >= 0) @@ -164,7 +164,7 @@ ssize_t uwac_os_recvmsg_cloexec(int sockfd, struct msghdr* msg, int flags) int uwac_os_epoll_create_cloexec(void) { - int fd; + int fd = 0; #ifdef EPOLL_CLOEXEC fd = epoll_create1(EPOLL_CLOEXEC); @@ -181,7 +181,7 @@ int uwac_os_epoll_create_cloexec(void) static int create_tmpfile_cloexec(char* tmpname) { - int fd; + int fd = 0; #ifdef USE_SHM fd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600); #elif defined(UWAC_HAVE_MKOSTEMP) @@ -227,11 +227,11 @@ static int create_tmpfile_cloexec(char* tmpname) int uwac_create_anonymous_file(off_t size) { static const char template[] = "/weston-shared-XXXXXX"; - size_t length; - char* name; - const char* path; - int fd; - int ret; + size_t length = 0; + char* name = NULL; + const char* path = NULL; + int fd = 0; + int ret = 0; path = getenv("XDG_RUNTIME_DIR"); if (!path) diff --git a/uwac/libuwac/uwac-tools.c b/uwac/libuwac/uwac-tools.c index 9362e3800..760970e67 100644 --- a/uwac/libuwac/uwac-tools.c +++ b/uwac/libuwac/uwac-tools.c @@ -42,7 +42,7 @@ void UwacTouchAutomataReset(UwacTouchAutomata* automata) bool UwacTouchAutomataInjectEvent(UwacTouchAutomata* automata, UwacEvent* event) { - UwacTouchPoint* tp; + UwacTouchPoint* tp = NULL; switch (event->type) { diff --git a/uwac/libuwac/uwac-window.c b/uwac/libuwac/uwac-window.c index 76141ad75..1ad22eade 100644 --- a/uwac/libuwac/uwac-window.c +++ b/uwac/libuwac/uwac-window.c @@ -58,7 +58,7 @@ static const struct wl_buffer_listener buffer_listener = { buffer_release }; static void UwacWindowDestroyBuffers(UwacWindow* w) { - int i; + int i = 0; for (i = 0; i < w->nbuffers; i++) { @@ -90,10 +90,10 @@ static void xdg_handle_toplevel_configure(void* data, struct xdg_toplevel* xdg_t int scale = window->display->actual_scale; width *= scale; height *= scale; - UwacConfigureEvent* event; - int ret; - int surfaceState; - enum xdg_toplevel_state* state; + UwacConfigureEvent* event = NULL; + int ret = 0; + int surfaceState = 0; + enum xdg_toplevel_state* state = NULL; surfaceState = 0; wl_array_for_each(state, states) { @@ -173,7 +173,7 @@ static void xdg_handle_toplevel_configure(void* data, struct xdg_toplevel* xdg_t static void xdg_handle_toplevel_close(void* data, struct xdg_toplevel* xdg_toplevel) { - UwacCloseEvent* event; + UwacCloseEvent* event = NULL; UwacWindow* window = (UwacWindow*)data; event = (UwacCloseEvent*)UwacDisplayNewEvent(window->display, UWAC_EVENT_CLOSE); @@ -208,8 +208,8 @@ static void ivi_handle_configure(void* data, struct ivi_surface* surface, int32_ int32_t height) { UwacWindow* window = (UwacWindow*)data; - UwacConfigureEvent* event; - int ret; + UwacConfigureEvent* event = NULL; + int ret = 0; event = (UwacConfigureEvent*)UwacDisplayNewEvent(window->display, UWAC_EVENT_CONFIGURE); if (!event) @@ -266,8 +266,8 @@ static void shell_configure(void* data, struct wl_shell_surface* surface, uint32 int32_t width, int32_t height) { UwacWindow* window = (UwacWindow*)data; - UwacConfigureEvent* event; - int ret; + UwacConfigureEvent* event = NULL; + int ret = 0; event = (UwacConfigureEvent*)UwacDisplayNewEvent(window->display, UWAC_EVENT_CONFIGURE); if (!event) @@ -321,11 +321,11 @@ int UwacWindowShmAllocBuffers(UwacWindow* w, int nbuffers, int allocSize, uint32 uint32_t height, enum wl_shm_format format) { int ret = UWAC_SUCCESS; - UwacBuffer* newBuffers; - int i; - int fd; - void* data; - struct wl_shm_pool* pool; + UwacBuffer* newBuffers = NULL; + int i = 0; + int fd = 0; + void* data = NULL; + struct wl_shm_pool* pool = NULL; size_t pagesize = sysconf(_SC_PAGESIZE); newBuffers = xrealloc(w->buffers, (w->nbuffers + nbuffers) * sizeof(UwacBuffer)); @@ -389,8 +389,8 @@ error_mmap: static UwacBuffer* UwacWindowFindFreeBuffer(UwacWindow* w, ssize_t* index) { - ssize_t i; - int ret; + ssize_t i = 0; + int ret = 0; if (index) *index = -1; @@ -457,9 +457,9 @@ static UwacReturnCode UwacWindowSetDecorations(UwacWindow* w) UwacWindow* UwacCreateWindowShm(UwacDisplay* display, uint32_t width, uint32_t height, enum wl_shm_format format) { - UwacWindow* w; - int allocSize; - int ret; + UwacWindow* w = NULL; + int allocSize = 0; + int ret = 0; if (!display) { @@ -506,8 +506,8 @@ UwacWindow* UwacCreateWindowShm(UwacDisplay* display, uint32_t width, uint32_t h char* env = getenv("IVI_SURFACE_ID"); if (env) { - unsigned long val; - char* endp; + unsigned long val = 0; + char* endp = NULL; errno = 0; val = strtoul(env, &endp, 10); @@ -588,7 +588,7 @@ out_error_free: UwacReturnCode UwacDestroyWindow(UwacWindow** pwindow) { - UwacWindow* w; + UwacWindow* w = NULL; assert(pwindow); w = *pwindow; UwacWindowDestroyBuffers(w); @@ -663,7 +663,7 @@ UwacReturnCode UwacWindowSetInputRegion(UwacWindow* window, uint32_t x, uint32_t void* UwacWindowGetDrawingBuffer(UwacWindow* window) { - UwacBuffer* buffer; + UwacBuffer* buffer = NULL; if (window->drawingBufferIdx < 0) return NULL; @@ -682,12 +682,12 @@ static const struct wl_callback_listener frame_listener = { frame_done_cb }; #ifdef UWAC_HAVE_PIXMAN_REGION static void damage_surface(UwacWindow* window, UwacBuffer* buffer, int scale) { - int nrects; - int i; - int x; - int y; - int w; - int h; + int nrects = 0; + int i = 0; + int x = 0; + int y = 0; + int w = 0; + int h = 0; const pixman_box32_t* box = pixman_region32_rectangles(&buffer->damage, &nrects); for (i = 0; i < nrects; i++, box++) @@ -704,12 +704,12 @@ static void damage_surface(UwacWindow* window, UwacBuffer* buffer, int scale) #else static void damage_surface(UwacWindow* window, UwacBuffer* buffer, int scale) { - uint32_t nrects; - uint32_t i; - int x; - int y; - int w; - int h; + uint32_t nrects = 0; + uint32_t i = 0; + int x = 0; + int y = 0; + int w = 0; + int h = 0; const RECTANGLE_16* box = region16_rects(&buffer->damage, &nrects); for (i = 0; i < nrects; i++, box++) @@ -741,7 +741,7 @@ static void UwacSubmitBufferPtr(UwacWindow* window, UwacBuffer* buffer) static void frame_done_cb(void* data, struct wl_callback* callback, uint32_t time) { UwacWindow* window = (UwacWindow*)data; - UwacFrameDoneEvent* event; + UwacFrameDoneEvent* event = NULL; wl_callback_destroy(callback); window->pendingBufferIdx = -1; @@ -755,7 +755,7 @@ static void frame_done_cb(void* data, struct wl_callback* callback, uint32_t tim UwacReturnCode UwacWindowAddDamage(UwacWindow* window, uint32_t x, uint32_t y, uint32_t width, uint32_t height) { - UwacBuffer* buf; + UwacBuffer* buf = NULL; if (window->drawingBufferIdx < 0) return UWAC_ERROR_INTERNAL; @@ -772,7 +772,7 @@ UwacReturnCode UwacWindowAddDamage(UwacWindow* window, uint32_t x, uint32_t y, u uint32_t height) { RECTANGLE_16 box; - UwacBuffer* buf; + UwacBuffer* buf = NULL; box.left = x; box.top = y; @@ -814,9 +814,9 @@ UwacReturnCode UwacWindowGetDrawingBufferGeometry(UwacWindow* window, UwacSize* UwacReturnCode UwacWindowSubmitBuffer(UwacWindow* window, bool copyContentForNextFrame) { - UwacBuffer* currentDrawingBuffer; - UwacBuffer* nextDrawingBuffer; - UwacBuffer* pendingBuffer; + UwacBuffer* currentDrawingBuffer = NULL; + UwacBuffer* nextDrawingBuffer = NULL; + UwacBuffer* pendingBuffer = NULL; if (window->drawingBufferIdx < 0) return UWAC_ERROR_INTERNAL; diff --git a/winpr/libwinpr/clipboard/clipboard.c b/winpr/libwinpr/clipboard/clipboard.c index 05d57c42b..ba4805af0 100644 --- a/winpr/libwinpr/clipboard/clipboard.c +++ b/winpr/libwinpr/clipboard/clipboard.c @@ -73,7 +73,7 @@ const char* ClipboardGetFormatIdString(UINT32 formatId) static wClipboardFormat* ClipboardFindFormat(wClipboard* clipboard, UINT32 formatId, const char* name) { - UINT32 index; + UINT32 index = 0; wClipboardFormat* format = NULL; if (!clipboard) @@ -181,9 +181,9 @@ UINT32 ClipboardCountRegisteredFormats(wClipboard* clipboard) UINT32 ClipboardGetRegisteredFormatIds(wClipboard* clipboard, UINT32** ppFormatIds) { - UINT32 index; - UINT32* pFormatIds; - wClipboardFormat* format; + UINT32 index = 0; + UINT32* pFormatIds = NULL; + wClipboardFormat* format = NULL; if (!clipboard) return 0; @@ -214,7 +214,7 @@ UINT32 ClipboardGetRegisteredFormatIds(wClipboard* clipboard, UINT32** ppFormatI UINT32 ClipboardRegisterFormat(wClipboard* clipboard, const char* name) { - wClipboardFormat* format; + wClipboardFormat* format = NULL; if (!clipboard) return 0; @@ -227,7 +227,7 @@ UINT32 ClipboardRegisterFormat(wClipboard* clipboard, const char* name) if ((clipboard->numFormats + 1) >= clipboard->maxFormats) { UINT32 numFormats = clipboard->maxFormats * 2; - wClipboardFormat* tmpFormat; + wClipboardFormat* tmpFormat = NULL; tmpFormat = (wClipboardFormat*)realloc(clipboard->formats, numFormats * sizeof(wClipboardFormat)); @@ -257,9 +257,9 @@ UINT32 ClipboardRegisterFormat(wClipboard* clipboard, const char* name) BOOL ClipboardRegisterSynthesizer(wClipboard* clipboard, UINT32 formatId, UINT32 syntheticId, CLIPBOARD_SYNTHESIZE_FN pfnSynthesize) { - UINT32 index; - wClipboardFormat* format; - wClipboardSynthesizer* synthesizer; + UINT32 index = 0; + wClipboardFormat* format = NULL; + wClipboardSynthesizer* synthesizer = NULL; if (!clipboard) return FALSE; @@ -276,7 +276,7 @@ BOOL ClipboardRegisterSynthesizer(wClipboard* clipboard, UINT32 formatId, UINT32 if (!synthesizer) { - wClipboardSynthesizer* tmpSynthesizer; + wClipboardSynthesizer* tmpSynthesizer = NULL; UINT32 numSynthesizers = format->numSynthesizers + 1; tmpSynthesizer = (wClipboardSynthesizer*)realloc( format->synthesizers, numSynthesizers * sizeof(wClipboardSynthesizer)); @@ -297,8 +297,8 @@ BOOL ClipboardRegisterSynthesizer(wClipboard* clipboard, UINT32 formatId, UINT32 UINT32 ClipboardCountFormats(wClipboard* clipboard) { - UINT32 count; - wClipboardFormat* format; + UINT32 count = 0; + wClipboardFormat* format = NULL; if (!clipboard) return 0; @@ -314,11 +314,11 @@ UINT32 ClipboardCountFormats(wClipboard* clipboard) UINT32 ClipboardGetFormatIds(wClipboard* clipboard, UINT32** ppFormatIds) { - UINT32 index; - UINT32 count; - UINT32* pFormatIds; - wClipboardFormat* format; - wClipboardSynthesizer* synthesizer; + UINT32 index = 0; + UINT32 count = 0; + UINT32* pFormatIds = NULL; + wClipboardFormat* format = NULL; + wClipboardSynthesizer* synthesizer = NULL; if (!clipboard) return 0; @@ -372,7 +372,7 @@ static void ClipboardUninitFormats(wClipboard* clipboard) static BOOL ClipboardInitFormats(wClipboard* clipboard) { UINT32 formatId = 0; - wClipboardFormat* format; + wClipboardFormat* format = NULL; if (!clipboard) return FALSE; @@ -400,7 +400,7 @@ error: UINT32 ClipboardGetFormatId(wClipboard* clipboard, const char* name) { - wClipboardFormat* format; + wClipboardFormat* format = NULL; if (!clipboard) return 0; @@ -415,7 +415,7 @@ UINT32 ClipboardGetFormatId(wClipboard* clipboard, const char* name) const char* ClipboardGetFormatName(wClipboard* clipboard, UINT32 formatId) { - wClipboardFormat* format; + wClipboardFormat* format = NULL; if (!clipboard) return NULL; @@ -434,8 +434,8 @@ void* ClipboardGetData(wClipboard* clipboard, UINT32 formatId, UINT32* pSize) UINT32 DstSize = 0; void* pSrcData = NULL; void* pDstData = NULL; - wClipboardFormat* format; - wClipboardSynthesizer* synthesizer; + wClipboardFormat* format = NULL; + wClipboardSynthesizer* synthesizer = NULL; if (!clipboard) return NULL; @@ -481,7 +481,7 @@ void* ClipboardGetData(wClipboard* clipboard, UINT32 formatId, UINT32* pSize) BOOL ClipboardSetData(wClipboard* clipboard, UINT32 formatId, const void* data, UINT32 size) { - wClipboardFormat* format; + wClipboardFormat* format = NULL; if (!clipboard) return FALSE; diff --git a/winpr/libwinpr/clipboard/synthetic.c b/winpr/libwinpr/clipboard/synthetic.c index e9dfd42d0..19e051031 100644 --- a/winpr/libwinpr/clipboard/synthetic.c +++ b/winpr/libwinpr/clipboard/synthetic.c @@ -39,7 +39,7 @@ static void* clipboard_synthesize_cf_text(wClipboard* clipboard, UINT32 formatId, const void* data, UINT32* pSize) { - size_t size; + size_t size = 0; char* pDstData = NULL; if (formatId == CF_UNICODETEXT) @@ -110,7 +110,7 @@ static void* clipboard_synthesize_cf_locale(wClipboard* clipboard, UINT32 format static void* clipboard_synthesize_cf_unicodetext(wClipboard* clipboard, UINT32 formatId, const void* data, UINT32* pSize) { - size_t size; + size_t size = 0; char* crlfStr = NULL; WCHAR* pDstData = NULL; @@ -151,7 +151,7 @@ static void* clipboard_synthesize_cf_unicodetext(wClipboard* clipboard, UINT32 f static void* clipboard_synthesize_utf8_string(wClipboard* clipboard, UINT32 formatId, const void* data, UINT32* pSize) { - size_t size; + size_t size = 0; char* pDstData = NULL; if (formatId == CF_UNICODETEXT) @@ -168,7 +168,7 @@ static void* clipboard_synthesize_utf8_string(wClipboard* clipboard, UINT32 form else if ((formatId == CF_TEXT) || (formatId == CF_OEMTEXT) || (formatId == ClipboardGetFormatId(clipboard, mime_text_plain))) { - int rc; + int rc = 0; size = *pSize; pDstData = (char*)malloc(size); @@ -198,9 +198,9 @@ static void* clipboard_synthesize_utf8_string(wClipboard* clipboard, UINT32 form static void* clipboard_synthesize_cf_dib(wClipboard* clipboard, UINT32 formatId, const void* data, UINT32* pSize) { - UINT32 SrcSize; - UINT32 DstSize; - BYTE* pDstData; + UINT32 SrcSize = 0; + UINT32 DstSize = 0; + BYTE* pDstData = NULL; SrcSize = *pSize; if (formatId == CF_DIBV5) @@ -208,7 +208,7 @@ static void* clipboard_synthesize_cf_dib(wClipboard* clipboard, UINT32 formatId, } else if (formatId == ClipboardGetFormatId(clipboard, "image/bmp")) { - const BITMAPFILEHEADER* pFileHeader; + const BITMAPFILEHEADER* pFileHeader = NULL; if (SrcSize < (sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER))) return NULL; @@ -261,16 +261,16 @@ static void* clipboard_synthesize_cf_dibv5(wClipboard* clipboard, UINT32 formatI static void* clipboard_synthesize_image_bmp(wClipboard* clipboard, UINT32 formatId, const void* data, UINT32* pSize) { - UINT32 SrcSize; - UINT32 DstSize; - BYTE* pDstData; + UINT32 SrcSize = 0; + UINT32 DstSize = 0; + BYTE* pDstData = NULL; SrcSize = *pSize; if (formatId == CF_DIB) { - BYTE* pDst; - const BITMAPINFOHEADER* pInfoHeader; - BITMAPFILEHEADER* pFileHeader; + BYTE* pDst = NULL; + const BITMAPINFOHEADER* pInfoHeader = NULL; + BITMAPFILEHEADER* pFileHeader = NULL; if (SrcSize < sizeof(BITMAPINFOHEADER)) return NULL; @@ -331,7 +331,7 @@ static void* clipboard_synthesize_html_format(wClipboard* clipboard, UINT32 form { const INT64 SrcSize = (INT64)*pSize; const size_t DstSize = SrcSize + 200; - char* body; + char* body = NULL; char num[20] = { 0 }; /* Create a copy, we modify the input data */ @@ -429,17 +429,17 @@ fail: static void* clipboard_synthesize_text_html(wClipboard* clipboard, UINT32 formatId, const void* data, UINT32* pSize) { - long beg; - long end; - const char* str; - char* begStr; - char* endStr; + long beg = 0; + long end = 0; + const char* str = NULL; + char* begStr = NULL; + char* endStr = NULL; long DstSize = -1; BYTE* pDstData = NULL; if (formatId == ClipboardGetFormatId(clipboard, "HTML Format")) { - INT64 SrcSize; + INT64 SrcSize = 0; str = (const char*)data; SrcSize = (INT64)*pSize; begStr = strstr(str, "StartHTML:"); @@ -476,8 +476,8 @@ static void* clipboard_synthesize_text_html(wClipboard* clipboard, UINT32 format BOOL ClipboardInitSynthesizers(wClipboard* clipboard) { - UINT32 formatId; - UINT32 altFormatId; + UINT32 formatId = 0; + UINT32 altFormatId = 0; /** * CF_TEXT */ diff --git a/winpr/libwinpr/clipboard/synthetic_file.c b/winpr/libwinpr/clipboard/synthetic_file.c index cfa5f416e..3482a2579 100644 --- a/winpr/libwinpr/clipboard/synthetic_file.c +++ b/winpr/libwinpr/clipboard/synthetic_file.c @@ -74,7 +74,7 @@ static struct synthetic_file* make_synthetic_file(const WCHAR* local_name, const { struct synthetic_file* file = NULL; WIN32_FIND_DATAW fd = { 0 }; - HANDLE hFind; + HANDLE hFind = NULL; WINPR_ASSERT(local_name); WINPR_ASSERT(remote_name); @@ -506,7 +506,7 @@ static BOOL convert_local_file_to_filedescriptor(const struct synthetic_file* fi static FILEDESCRIPTORW* convert_local_file_list_to_filedescriptors(wArrayList* files) { - size_t i; + size_t i = 0; size_t count = 0; FILEDESCRIPTORW* descriptors = NULL; @@ -534,7 +534,7 @@ error: static void* convert_any_uri_list_to_filedescriptors(wClipboard* clipboard, UINT32 formatId, UINT32* pSize) { - FILEDESCRIPTORW* descriptors; + FILEDESCRIPTORW* descriptors = NULL; WINPR_ASSERT(clipboard); WINPR_ASSERT(pSize); @@ -705,16 +705,16 @@ static void* convert_filedescriptors_to_file_list(wClipboard* clipboard, UINT32 const FILEDESCRIPTORW* descriptors = NULL; UINT32 nrDescriptors = 0; - size_t count; - size_t x; - size_t alloc; - size_t pos; + size_t count = 0; + size_t x = 0; + size_t alloc = 0; + size_t pos = 0; size_t baseLength = 0; - char* dst; + char* dst = NULL; size_t header_len = strlen(header); size_t lineprefix_len = strlen(lineprefix); size_t lineending_len = strlen(lineending); - size_t decoration_len; + size_t decoration_len = 0; if (!clipboard || !data || !pSize) return NULL; @@ -933,7 +933,7 @@ static void array_free_synthetic_file(void* the_file) static BOOL register_file_formats_and_synthesizers(wClipboard* clipboard) { - wObject* obj; + wObject* obj = NULL; /* 1. Gnome Nautilus based file manager (Nautilus only with version >= 3.30 AND < 40): diff --git a/winpr/libwinpr/clipboard/test/TestClipboardFormats.c b/winpr/libwinpr/clipboard/test/TestClipboardFormats.c index f3f0f6a98..4c21a8b1b 100644 --- a/winpr/libwinpr/clipboard/test/TestClipboardFormats.c +++ b/winpr/libwinpr/clipboard/test/TestClipboardFormats.c @@ -5,12 +5,12 @@ int TestClipboardFormats(int argc, char* argv[]) { - UINT32 index; - UINT32 count; - UINT32* pFormatIds; - const char* formatName; - wClipboard* clipboard; - UINT32 utf8StringFormatId; + UINT32 index = 0; + UINT32 count = 0; + UINT32* pFormatIds = NULL; + const char* formatName = NULL; + wClipboard* clipboard = NULL; + UINT32 utf8StringFormatId = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); @@ -38,11 +38,11 @@ int TestClipboardFormats(int argc, char* argv[]) if (1) { - BOOL bSuccess; - UINT32 SrcSize; - UINT32 DstSize; + BOOL bSuccess = 0; + UINT32 SrcSize = 0; + UINT32 DstSize = 0; const char pSrcData[] = "this is a test string"; - char* pDstData; + char* pDstData = NULL; SrcSize = (UINT32)(strnlen(pSrcData, ARRAYSIZE(pSrcData)) + 1); bSuccess = ClipboardSetData(clipboard, utf8StringFormatId, pSrcData, SrcSize); @@ -55,9 +55,9 @@ int TestClipboardFormats(int argc, char* argv[]) if (1) { - UINT32 DstSize; - char* pSrcData; - WCHAR* pDstData; + UINT32 DstSize = 0; + char* pSrcData = NULL; + WCHAR* pDstData = NULL; DstSize = 0; pDstData = (WCHAR*)ClipboardGetData(clipboard, CF_UNICODETEXT, &DstSize); pSrcData = ConvertWCharNToUtf8Alloc(pDstData, DstSize / sizeof(WCHAR), NULL); diff --git a/winpr/libwinpr/comm/comm.c b/winpr/libwinpr/comm/comm.c index d918ce82d..a77adcc33 100644 --- a/winpr/libwinpr/comm/comm.c +++ b/winpr/libwinpr/comm/comm.c @@ -293,7 +293,7 @@ BOOL GetCommModemStatus(HANDLE hFile, PDWORD lpModemStat) BOOL GetCommProperties(HANDLE hFile, LPCOMMPROP lpCommProp) { WINPR_COMM* pComm = (WINPR_COMM*)hFile; - DWORD bytesReturned; + DWORD bytesReturned = 0; if (!CommIsHandleValid(hFile)) return FALSE; @@ -319,10 +319,10 @@ BOOL GetCommProperties(HANDLE hFile, LPCOMMPROP lpCommProp) */ BOOL GetCommState(HANDLE hFile, LPDCB lpDCB) { - DCB* lpLocalDcb; + DCB* lpLocalDcb = NULL; struct termios currentState; WINPR_COMM* pComm = (WINPR_COMM*)hFile; - DWORD bytesReturned; + DWORD bytesReturned = 0; if (!CommIsHandleValid(hFile)) return FALSE; @@ -474,7 +474,7 @@ BOOL SetCommState(HANDLE hFile, LPDCB lpDCB) { struct termios upcomingTermios = { 0 }; WINPR_COMM* pComm = (WINPR_COMM*)hFile; - DWORD bytesReturned; + DWORD bytesReturned = 0; /* FIXME: validate changes according GetCommProperties? */ @@ -694,7 +694,7 @@ BOOL SetCommState(HANDLE hFile, LPDCB lpDCB) BOOL GetCommTimeouts(HANDLE hFile, LPCOMMTIMEOUTS lpCommTimeouts) { WINPR_COMM* pComm = (WINPR_COMM*)hFile; - DWORD bytesReturned; + DWORD bytesReturned = 0; if (!CommIsHandleValid(hFile)) return FALSE; @@ -718,7 +718,7 @@ BOOL GetCommTimeouts(HANDLE hFile, LPCOMMTIMEOUTS lpCommTimeouts) BOOL SetCommTimeouts(HANDLE hFile, LPCOMMTIMEOUTS lpCommTimeouts) { WINPR_COMM* pComm = (WINPR_COMM*)hFile; - DWORD bytesReturned; + DWORD bytesReturned = 0; if (!CommIsHandleValid(hFile)) return FALSE; @@ -1027,8 +1027,8 @@ error_handle: */ DWORD QueryCommDevice(LPCTSTR lpDeviceName, LPTSTR lpTargetPath, DWORD ucchMax) { - int i; - LPTSTR storedTargetPath; + int i = 0; + LPTSTR storedTargetPath = NULL; SetLastError(ERROR_SUCCESS); if (!CommInitialized()) @@ -1107,9 +1107,9 @@ BOOL IsCommDevice(LPCTSTR lpDeviceName) */ void _comm_setServerSerialDriver(HANDLE hComm, SERIAL_DRIVER_ID driverId) { - ULONG Type; - WINPR_HANDLE* Object; - WINPR_COMM* pComm; + ULONG Type = 0; + WINPR_HANDLE* Object = NULL; + WINPR_COMM* pComm = NULL; if (!CommInitialized()) return; diff --git a/winpr/libwinpr/comm/comm_io.c b/winpr/libwinpr/comm/comm_io.c index 6cbf5355a..9904eab5d 100644 --- a/winpr/libwinpr/comm/comm_io.c +++ b/winpr/libwinpr/comm/comm_io.c @@ -73,13 +73,13 @@ BOOL CommReadFile(HANDLE hDevice, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, WINPR_COMM* pComm = (WINPR_COMM*)hDevice; int biggestFd = -1; fd_set read_set; - int nbFds; - COMMTIMEOUTS* pTimeouts; + int nbFds = 0; + COMMTIMEOUTS* pTimeouts = NULL; UCHAR vmin = 0; UCHAR vtime = 0; ULONGLONG Tmax = 0; struct timeval tmaxTimeout; - struct timeval* pTmaxTimeout; + struct timeval* pTmaxTimeout = NULL; struct termios currentTermios; EnterCriticalSection(&pComm->ReadLock); /* KISSer by the function's beginning */ @@ -368,7 +368,7 @@ BOOL CommWriteFile(HANDLE hDevice, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite { WINPR_COMM* pComm = (WINPR_COMM*)hDevice; struct timeval tmaxTimeout; - struct timeval* pTmaxTimeout; + struct timeval* pTmaxTimeout = NULL; EnterCriticalSection(&pComm->WriteLock); /* KISSer by the function's beginning */ if (!CommIsHandled(hDevice)) @@ -424,7 +424,7 @@ BOOL CommWriteFile(HANDLE hDevice, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite int biggestFd = -1; fd_set event_set; fd_set write_set; - int nbFds; + int nbFds = 0; biggestFd = pComm->fd_write; if (pComm->fd_write_event > biggestFd) @@ -492,7 +492,7 @@ BOOL CommWriteFile(HANDLE hDevice, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite if (FD_ISSET(pComm->fd_write, &write_set)) { - ssize_t nbWritten; + ssize_t nbWritten = 0; nbWritten = write(pComm->fd_write, ((const BYTE*)lpBuffer) + (*lpNumberOfBytesWritten), nNumberOfBytesToWrite - (*lpNumberOfBytesWritten)); diff --git a/winpr/libwinpr/comm/comm_ioctl.c b/winpr/libwinpr/comm/comm_ioctl.c index f81613791..a7e67d0b5 100644 --- a/winpr/libwinpr/comm/comm_ioctl.c +++ b/winpr/libwinpr/comm/comm_ioctl.c @@ -53,7 +53,7 @@ const char* _comm_serial_ioctl_name(ULONG number) { - int i; + int i = 0; for (i = 0; _SERIAL_IOCTL_NAMES[i].number != 0; i++) { @@ -639,7 +639,7 @@ BOOL CommDeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffe LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped) { WINPR_COMM* pComm = (WINPR_COMM*)hDevice; - BOOL result; + BOOL result = 0; if (hDevice == INVALID_HANDLE_VALUE) { @@ -686,7 +686,7 @@ BOOL CommDeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffe int _comm_ioctl_tcsetattr(int fd, int optional_actions, const struct termios* termios_p) { - int result; + int result = 0; struct termios currentState = { 0 }; if ((result = tcsetattr(fd, optional_actions, termios_p)) < 0) diff --git a/winpr/libwinpr/comm/comm_sercx2_sys.c b/winpr/libwinpr/comm/comm_sercx2_sys.c index 66bd8616d..d636124ab 100644 --- a/winpr/libwinpr/comm/comm_sercx2_sys.c +++ b/winpr/libwinpr/comm/comm_sercx2_sys.c @@ -66,7 +66,7 @@ static const ULONG _SERCX2_SYS_SUPPORTED_EV_MASK = /* use Serial.sys for basis (not SerCx.sys) */ static BOOL _set_wait_mask(WINPR_COMM* pComm, const ULONG* pWaitMask) { - ULONG possibleMask; + ULONG possibleMask = 0; SERIAL_DRIVER* pSerialSys = SerialSys_s(); possibleMask = *pWaitMask & _SERCX2_SYS_SUPPORTED_EV_MASK; diff --git a/winpr/libwinpr/comm/comm_sercx_sys.c b/winpr/libwinpr/comm/comm_sercx_sys.c index 46bc20bf2..ece456f38 100644 --- a/winpr/libwinpr/comm/comm_sercx_sys.c +++ b/winpr/libwinpr/comm/comm_sercx_sys.c @@ -123,7 +123,7 @@ static BOOL _set_handflow(WINPR_COMM* pComm, const SERIAL_HANDFLOW* pHandflow) static BOOL _get_handflow(WINPR_COMM* pComm, SERIAL_HANDFLOW* pHandflow) { - BOOL result; + BOOL result = 0; SERIAL_DRIVER* pSerialSys = SerialSys_s(); result = pSerialSys->get_handflow(pComm, pHandflow); @@ -155,7 +155,7 @@ static const ULONG _SERCX_SYS_SUPPORTED_EV_MASK = SERIAL_EV_RXCHAR | static BOOL _set_wait_mask(WINPR_COMM* pComm, const ULONG* pWaitMask) { - ULONG possibleMask; + ULONG possibleMask = 0; SERIAL_DRIVER* pSerialSys = SerialSys_s(); possibleMask = *pWaitMask & _SERCX_SYS_SUPPORTED_EV_MASK; diff --git a/winpr/libwinpr/comm/comm_serial_sys.c b/winpr/libwinpr/comm/comm_serial_sys.c index 62bc0b1e5..49db222ac 100644 --- a/winpr/libwinpr/comm/comm_serial_sys.c +++ b/winpr/libwinpr/comm/comm_serial_sys.c @@ -158,7 +158,7 @@ static const speed_t _BAUD_TABLE[][3] = { static BOOL _get_properties(WINPR_COMM* pComm, COMMPROP* pProperties) { - int i; + int i = 0; /* http://msdn.microsoft.com/en-us/library/windows/hardware/jj680684%28v=vs.85%29.aspx * http://msdn.microsoft.com/en-us/library/windows/desktop/aa363189%28v=vs.85%29.aspx @@ -224,8 +224,8 @@ static BOOL _get_properties(WINPR_COMM* pComm, COMMPROP* pProperties) static BOOL _set_baud_rate(WINPR_COMM* pComm, const SERIAL_BAUD_RATE* pBaudRate) { - int i; - speed_t newSpeed; + int i = 0; + speed_t newSpeed = 0; struct termios futureState; ZeroMemory(&futureState, sizeof(struct termios)); @@ -269,8 +269,8 @@ static BOOL _set_baud_rate(WINPR_COMM* pComm, const SERIAL_BAUD_RATE* pBaudRate) static BOOL _get_baud_rate(WINPR_COMM* pComm, SERIAL_BAUD_RATE* pBaudRate) { - int i; - speed_t currentSpeed; + int i = 0; + speed_t currentSpeed = 0; struct termios currentState; ZeroMemory(¤tState, sizeof(struct termios)); @@ -1033,7 +1033,7 @@ static const ULONG _SERIAL_SYS_SUPPORTED_EV_MASK = static BOOL _set_wait_mask(WINPR_COMM* pComm, const ULONG* pWaitMask) { - ULONG possibleMask; + ULONG possibleMask = 0; /* Stops pending IOCTL_SERIAL_WAIT_ON_MASK * http://msdn.microsoft.com/en-us/library/ff546805%28v=vs.85%29.aspx @@ -1576,7 +1576,7 @@ static BOOL _config_size(WINPR_COMM* pComm, ULONG* pSize) static BOOL _immediate_char(WINPR_COMM* pComm, const UCHAR* pChar) { - BOOL result; + BOOL result = 0; DWORD nbBytesWritten = -1; /* FIXME: CommWriteFile uses a critical section, shall it be diff --git a/winpr/libwinpr/crt/alignment.c b/winpr/libwinpr/crt/alignment.c index bfba54bd3..e313c2d80 100644 --- a/winpr/libwinpr/crt/alignment.c +++ b/winpr/libwinpr/crt/alignment.c @@ -77,12 +77,12 @@ void* winpr_aligned_recalloc(void* memblock, size_t num, size_t size, size_t ali void* winpr_aligned_offset_malloc(size_t size, size_t alignment, size_t offset) { - size_t header; - size_t alignsize; - uintptr_t basesize; - void* base; - void* memblock; - WINPR_ALIGNED_MEM* pMem; + size_t header = 0; + size_t alignsize = 0; + uintptr_t basesize = 0; + void* base = NULL; + void* memblock = NULL; + WINPR_ALIGNED_MEM* pMem = NULL; /* alignment must be a power of 2 */ if (alignment % 2 == 1) @@ -136,10 +136,10 @@ void* winpr_aligned_offset_malloc(size_t size, size_t alignment, size_t offset) void* winpr_aligned_offset_realloc(void* memblock, size_t size, size_t alignment, size_t offset) { - size_t copySize; - void* newMemblock; - WINPR_ALIGNED_MEM* pMem; - WINPR_ALIGNED_MEM* pNewMem; + size_t copySize = 0; + void* newMemblock = NULL; + WINPR_ALIGNED_MEM* pMem = NULL; + WINPR_ALIGNED_MEM* pNewMem = NULL; if (!memblock) return winpr_aligned_offset_malloc(size, alignment, offset); @@ -231,7 +231,7 @@ fail: size_t winpr_aligned_msize(void* memblock, size_t alignment, size_t offset) { - WINPR_ALIGNED_MEM* pMem; + WINPR_ALIGNED_MEM* pMem = NULL; if (!memblock) return 0; @@ -249,7 +249,7 @@ size_t winpr_aligned_msize(void* memblock, size_t alignment, size_t offset) void winpr_aligned_free(void* memblock) { - WINPR_ALIGNED_MEM* pMem; + WINPR_ALIGNED_MEM* pMem = NULL; if (!memblock) return; diff --git a/winpr/libwinpr/crt/conversion.c b/winpr/libwinpr/crt/conversion.c index a8587de87..0a3d1e1c6 100644 --- a/winpr/libwinpr/crt/conversion.c +++ b/winpr/libwinpr/crt/conversion.c @@ -28,7 +28,7 @@ errno_t _itoa_s(int value, char* buffer, size_t sizeInCharacters, int radix) { - int length; + int length = 0; length = sprintf_s(NULL, 0, "%d", value); diff --git a/winpr/libwinpr/crt/string.c b/winpr/libwinpr/crt/string.c index 105729afa..0a5e5070e 100644 --- a/winpr/libwinpr/crt/string.c +++ b/winpr/libwinpr/crt/string.c @@ -324,7 +324,7 @@ size_t _wcslen(const WCHAR* str) size_t _wcsnlen(const WCHAR* str, size_t max) { - size_t x; + size_t x = 0; WINPR_ASSERT(str); @@ -407,8 +407,8 @@ char* strtok_s(char* strToken, const char* strDelimit, char** context) WCHAR* wcstok_s(WCHAR* strToken, const WCHAR* strDelimit, WCHAR** context) { - WCHAR* nextToken; - WCHAR value; + WCHAR* nextToken = NULL; + WCHAR value = 0; if (!strToken) strToken = *context; @@ -452,8 +452,8 @@ WCHAR* wcstok_s(WCHAR* strToken, const WCHAR* strDelimit, WCHAR** context) LPSTR CharUpperA(LPSTR lpsz) { - size_t i; - size_t length; + size_t i = 0; + size_t length = 0; if (!lpsz) return NULL; @@ -485,8 +485,8 @@ LPSTR CharUpperA(LPSTR lpsz) LPWSTR CharUpperW(LPWSTR lpsz) { - size_t i; - size_t length; + size_t i = 0; + size_t length = 0; if (!lpsz) return NULL; @@ -518,7 +518,7 @@ LPWSTR CharUpperW(LPWSTR lpsz) DWORD CharUpperBuffA(LPSTR lpsz, DWORD cchLength) { - DWORD i; + DWORD i = 0; if (cchLength < 1) return 0; @@ -534,8 +534,8 @@ DWORD CharUpperBuffA(LPSTR lpsz, DWORD cchLength) DWORD CharUpperBuffW(LPWSTR lpsz, DWORD cchLength) { - DWORD i; - WCHAR value; + DWORD i = 0; + WCHAR value = 0; for (i = 0; i < cchLength; i++) { @@ -549,8 +549,8 @@ DWORD CharUpperBuffW(LPWSTR lpsz, DWORD cchLength) LPSTR CharLowerA(LPSTR lpsz) { - size_t i; - size_t length; + size_t i = 0; + size_t length = 0; if (!lpsz) return (LPSTR)NULL; @@ -588,7 +588,7 @@ LPWSTR CharLowerW(LPWSTR lpsz) DWORD CharLowerBuffA(LPSTR lpsz, DWORD cchLength) { - DWORD i; + DWORD i = 0; if (cchLength < 1) return 0; @@ -604,8 +604,8 @@ DWORD CharLowerBuffA(LPSTR lpsz, DWORD cchLength) DWORD CharLowerBuffW(LPWSTR lpsz, DWORD cchLength) { - DWORD i; - WCHAR value; + DWORD i = 0; + WCHAR value = 0; for (i = 0; i < cchLength; i++) { @@ -766,7 +766,7 @@ char* ConvertLineEndingToCRLF(const char* str, size_t* size) char* StrSep(char** stringp, const char* delim) { char* start = *stringp; - char* p; + char* p = NULL; p = (start != NULL) ? strpbrk(start, delim) : NULL; if (!p) diff --git a/winpr/libwinpr/crt/test/TestAlignment.c b/winpr/libwinpr/crt/test/TestAlignment.c index adabf4841..07bac7f8d 100644 --- a/winpr/libwinpr/crt/test/TestAlignment.c +++ b/winpr/libwinpr/crt/test/TestAlignment.c @@ -5,9 +5,9 @@ int TestAlignment(int argc, char* argv[]) { - void* ptr; - size_t alignment; - size_t offset; + void* ptr = NULL; + size_t alignment = 0; + size_t offset = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/crt/test/TestString.c b/winpr/libwinpr/crt/test/TestString.c index d8c030676..cb7d0fbcd 100644 --- a/winpr/libwinpr/crt/test/TestString.c +++ b/winpr/libwinpr/crt/test/TestString.c @@ -80,10 +80,10 @@ static BOOL test_url_escape(void) int TestString(int argc, char* argv[]) { - const WCHAR* p; - size_t pos; - size_t length; - WCHAR* context; + const WCHAR* p = NULL; + size_t pos = 0; + size_t length = 0; + WCHAR* context = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c index a6c03ebc5..a5c4c75e8 100644 --- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c +++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c @@ -746,9 +746,9 @@ static int convert_utf8_to_utf16(BYTE* lpMultiByteStr, BYTE* expected_lpWideChar int expected_cchWideChar) { int rc = -1; - int length; - size_t cbMultiByte; - int cchWideChar; + int length = 0; + size_t cbMultiByte = 0; + int cchWideChar = 0; LPWSTR lpWideCharStr = NULL; cbMultiByte = strlen((char*)lpMultiByteStr); @@ -826,9 +826,9 @@ static int convert_utf16_to_utf8(BYTE* lpWideCharStr, BYTE* expected_lpMultiByte int expected_cbMultiByte) { int rc = -1; - int length; - int cchWideChar; - int cbMultiByte; + int length = 0; + int cchWideChar = 0; + int cbMultiByte = 0; LPSTR lpMultiByteStr = NULL; cchWideChar = _wcslen((WCHAR*)lpWideCharStr); @@ -905,9 +905,9 @@ fail: static BOOL test_unicode_uppercasing(BYTE* lower, BYTE* upper) { WCHAR* lowerW = NULL; - int lowerLength; + int lowerLength = 0; WCHAR* upperW = NULL; - int upperLength; + int upperLength = 0; lowerLength = ConvertToUnicode(CP_UTF8, 0, (LPSTR)lower, -1, &lowerW, 0); upperLength = ConvertToUnicode(CP_UTF8, 0, (LPSTR)upper, -1, &upperW, 0); @@ -945,7 +945,7 @@ static BOOL test_ConvertFromUnicode_wrapper(void) const CHAR cmp0[] = { 'R', 'I', 'C', 'H', ' ', 'T', 'E', 'X', 'T', ' ', 'F', 'O', 'R', 'M', 'A', 'T', 0 }; CHAR* dst = NULL; - int i; + int i = 0; /* Test unterminated unicode string: * ConvertFromUnicode must always null-terminate, even if the src string isn't @@ -1034,8 +1034,8 @@ static BOOL test_ConvertToUnicode_wrapper(void) const BYTE cmp0[] = "\x52\x00\x49\x00\x43\x00\x48\x00\x20\x00\x54\x00\x45\x00\x58\x00\x54\x00" "\x20\x00\x46\x00\x4f\x00\x52\x00\x4d\x00\x41\x00\x54\x00\x00\x00"; WCHAR* dst = NULL; - int ii; - size_t i; + int ii = 0; + size_t i = 0; /* Test static string buffers of differing sizes */ { diff --git a/winpr/libwinpr/crt/unicode.c b/winpr/libwinpr/crt/unicode.c index d55f55b09..123a488e9 100644 --- a/winpr/libwinpr/crt/unicode.c +++ b/winpr/libwinpr/crt/unicode.c @@ -233,7 +233,7 @@ static int ConvertToUnicode(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr, int cbMultiByte, LPWSTR* lpWideCharStr, int cchWideChar) { - int status; + int status = 0; BOOL allocate = FALSE; if (!lpMultiByteStr) @@ -306,7 +306,7 @@ int ConvertFromUnicode(UINT CodePage, DWORD dwFlags, LPCWSTR lpWideCharStr, int LPSTR* lpMultiByteStr, int cbMultiByte, LPCSTR lpDefaultChar, LPBOOL lpUsedDefaultChar) { - int status; + int status = 0; BOOL allocate = FALSE; if (!lpWideCharStr) diff --git a/winpr/libwinpr/crt/unicode_builtin.c b/winpr/libwinpr/crt/unicode_builtin.c index 9ca62b647..e56ddd781 100644 --- a/winpr/libwinpr/crt/unicode_builtin.c +++ b/winpr/libwinpr/crt/unicode_builtin.c @@ -140,18 +140,14 @@ static ConversionResult winpr_ConvertUTF16toUTF8_Internal(const uint16_t** sourc uint8_t** targetStart, uint8_t* targetEnd, ConversionFlags flags) { - uint8_t* target; - const uint16_t* source; - bool computeLength; - ConversionResult result; - computeLength = (!targetEnd) ? true : false; - source = *sourceStart; - target = *targetStart; - result = conversionOK; + bool computeLength = (!targetEnd) ? true : false; + const uint16_t* source = *sourceStart; + uint8_t* target = *targetStart; + ConversionResult result = conversionOK; while (source < sourceEnd) { - uint32_t ch; + uint32_t ch = 0; unsigned short bytesToWrite = 0; const uint32_t byteMask = 0xBF; const uint32_t byteMark = 0x80; @@ -309,7 +305,7 @@ static ConversionResult winpr_ConvertUTF16toUTF8_Internal(const uint16_t** sourc static bool isLegalUTF8(const uint8_t* source, int length) { - uint8_t a; + uint8_t a = 0; const uint8_t* srcptr = source + length; switch (length) @@ -388,14 +384,10 @@ static ConversionResult winpr_ConvertUTF8toUTF16_Internal(const uint8_t** source uint16_t* targetEnd, ConversionFlags flags) { - uint16_t* target; - const uint8_t* source; - bool computeLength; - ConversionResult result; - computeLength = (!targetEnd) ? true : false; - result = conversionOK; - source = *sourceStart; - target = *targetStart; + bool computeLength = (!targetEnd) ? true : false; + ConversionResult result = conversionOK; + const uint8_t* source = *sourceStart; + uint16_t* target = *targetStart; while (source < sourceEnd) { @@ -543,12 +535,12 @@ static ConversionResult winpr_ConvertUTF8toUTF16_Internal(const uint8_t** source static int winpr_ConvertUTF8toUTF16(const uint8_t* src, int cchSrc, uint16_t* dst, int cchDst) { - size_t length; + size_t length = 0; uint16_t* dstBeg = NULL; uint16_t* dstEnd = NULL; - const uint8_t* srcBeg; - const uint8_t* srcEnd; - ConversionResult result; + const uint8_t* srcBeg = NULL; + const uint8_t* srcEnd = NULL; + ConversionResult result = sourceIllegal; if (cchSrc == -1) cchSrc = strlen((char*)src) + 1; @@ -585,12 +577,12 @@ static int winpr_ConvertUTF8toUTF16(const uint8_t* src, int cchSrc, uint16_t* ds static int winpr_ConvertUTF16toUTF8(const uint16_t* src, int cchSrc, uint8_t* dst, int cchDst) { - size_t length; + size_t length = 0; uint8_t* dstBeg = NULL; uint8_t* dstEnd = NULL; - const uint16_t* srcBeg; - const uint16_t* srcEnd; - ConversionResult result; + const uint16_t* srcBeg = NULL; + const uint16_t* srcEnd = NULL; + ConversionResult result = sourceIllegal; if (cchSrc == -1) cchSrc = _wcslen((uint16_t*)src) + 1; diff --git a/winpr/libwinpr/crypto/cert.c b/winpr/libwinpr/crypto/cert.c index 5ad5b1fee..83b7213fd 100644 --- a/winpr/libwinpr/crypto/cert.c +++ b/winpr/libwinpr/crypto/cert.c @@ -158,7 +158,7 @@ HCERTSTORE CertOpenStore(LPCSTR lpszStoreProvider, DWORD dwMsgAndCertEncodingType, HCRYPTPROV_LEGACY hCryptProv, DWORD dwFlags, const void* pvPara) { - WINPR_CERTSTORE* certstore; + WINPR_CERTSTORE* certstore = NULL; certstore = (WINPR_CERTSTORE*)calloc(1, sizeof(WINPR_CERTSTORE)); @@ -173,7 +173,7 @@ HCERTSTORE CertOpenStore(LPCSTR lpszStoreProvider, DWORD dwMsgAndCertEncodingTyp HCERTSTORE CertOpenSystemStoreW(HCRYPTPROV_LEGACY hProv, LPCWSTR szSubsystemProtocol) { - HCERTSTORE hCertStore; + HCERTSTORE hCertStore = NULL; hCertStore = CertOpenStore(CERT_STORE_PROV_FILE, X509_ASN_ENCODING, hProv, 0, NULL); @@ -187,7 +187,7 @@ HCERTSTORE CertOpenSystemStoreA(HCRYPTPROV_LEGACY hProv, LPCSTR szSubsystemProto BOOL CertCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) { - WINPR_CERTSTORE* certstore; + WINPR_CERTSTORE* certstore = NULL; certstore = (WINPR_CERTSTORE*)hCertStore; diff --git a/winpr/libwinpr/crypto/cipher.c b/winpr/libwinpr/crypto/cipher.c index 7613a7613..243b04088 100644 --- a/winpr/libwinpr/crypto/cipher.c +++ b/winpr/libwinpr/crypto/cipher.c @@ -135,7 +135,7 @@ BOOL winpr_RC4_Update(WINPR_RC4_CTX* ctx, size_t length, const void* input, void return winpr_int_rc4_update(ctx->ictx, length, input, output); #elif defined(WITH_OPENSSL) WINPR_ASSERT(ctx->ctx); - int outputLength; + int outputLength = 0; if (length > INT_MAX) return FALSE; @@ -471,9 +471,9 @@ WINPR_CIPHER_CTX* winpr_Cipher_New(int cipher, int op, const void* key, const vo { WINPR_CIPHER_CTX* ctx = NULL; #if defined(WITH_OPENSSL) - int operation; - const EVP_CIPHER* evp; - EVP_CIPHER_CTX* octx; + int operation = 0; + const EVP_CIPHER* evp = NULL; + EVP_CIPHER_CTX* octx = NULL; if (!(evp = winpr_openssl_get_evp_cipher(cipher))) return NULL; @@ -625,8 +625,8 @@ int winpr_Cipher_BytesToKey(int cipher, WINPR_MD_TYPE md, const void* salt, cons * https://www.openssl.org/docs/manmaster/crypto/EVP_BytesToKey.html */ #if defined(WITH_OPENSSL) - const EVP_MD* evp_md; - const EVP_CIPHER* evp_cipher; + const EVP_MD* evp_md = NULL; + const EVP_CIPHER* evp_cipher = NULL; evp_md = winpr_openssl_get_evp_md((WINPR_MD_TYPE)md); evp_cipher = winpr_openssl_get_evp_cipher(cipher); return EVP_BytesToKey(evp_cipher, evp_md, salt, data, datal, count, key, iv); diff --git a/winpr/libwinpr/crypto/crypto.c b/winpr/libwinpr/crypto/crypto.c index ce6a94a12..057253f93 100644 --- a/winpr/libwinpr/crypto/crypto.c +++ b/winpr/libwinpr/crypto/crypto.c @@ -146,12 +146,12 @@ static wListDictionary* g_ProtectedMemoryBlocks = NULL; BOOL CryptProtectMemory(LPVOID pData, DWORD cbData, DWORD dwFlags) { - BYTE* pCipherText; - size_t cbOut; - size_t cbFinal; + BYTE* pCipherText = NULL; + size_t cbOut = 0; + size_t cbFinal = 0; WINPR_CIPHER_CTX* enc = NULL; BYTE randomKey[256] = { 0 }; - WINPR_PROTECTED_MEMORY_BLOCK* pMemBlock; + WINPR_PROTECTED_MEMORY_BLOCK* pMemBlock = NULL; if (dwFlags != CRYPTPROTECTMEMORY_SAME_PROCESS) return FALSE; @@ -211,8 +211,8 @@ out: BOOL CryptUnprotectMemory(LPVOID pData, DWORD cbData, DWORD dwFlags) { BYTE* pPlainText = NULL; - size_t cbOut; - size_t cbFinal; + size_t cbOut = 0; + size_t cbFinal = 0; WINPR_CIPHER_CTX* dec = NULL; WINPR_PROTECTED_MEMORY_BLOCK* pMemBlock = NULL; diff --git a/winpr/libwinpr/crypto/md4.c b/winpr/libwinpr/crypto/md4.c index b5a137406..07438059a 100644 --- a/winpr/libwinpr/crypto/md4.c +++ b/winpr/libwinpr/crypto/md4.c @@ -88,15 +88,15 @@ */ static const void* body(WINPR_MD4_CTX* ctx, const void* data, unsigned long size) { - const unsigned char* ptr; - winpr_MD4_u32plus a; - winpr_MD4_u32plus b; - winpr_MD4_u32plus c; - winpr_MD4_u32plus d; - winpr_MD4_u32plus saved_a; - winpr_MD4_u32plus saved_b; - winpr_MD4_u32plus saved_c; - winpr_MD4_u32plus saved_d; + const unsigned char* ptr = NULL; + winpr_MD4_u32plus a = 0; + winpr_MD4_u32plus b = 0; + winpr_MD4_u32plus c = 0; + winpr_MD4_u32plus d = 0; + winpr_MD4_u32plus saved_a = 0; + winpr_MD4_u32plus saved_b = 0; + winpr_MD4_u32plus saved_c = 0; + winpr_MD4_u32plus saved_d = 0; const winpr_MD4_u32plus ac1 = 0x5a827999; const winpr_MD4_u32plus ac2 = 0x6ed9eba1; @@ -197,9 +197,9 @@ void winpr_MD4_Init(WINPR_MD4_CTX* ctx) void winpr_MD4_Update(WINPR_MD4_CTX* ctx, const void* data, unsigned long size) { - winpr_MD4_u32plus saved_lo; - unsigned long used; - unsigned long available; + winpr_MD4_u32plus saved_lo = 0; + unsigned long used = 0; + unsigned long available = 0; saved_lo = ctx->lo; if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo) @@ -241,8 +241,8 @@ void winpr_MD4_Update(WINPR_MD4_CTX* ctx, const void* data, unsigned long size) void winpr_MD4_Final(unsigned char* result, WINPR_MD4_CTX* ctx) { - unsigned long used; - unsigned long available; + unsigned long used = 0; + unsigned long available = 0; used = ctx->lo & 0x3f; diff --git a/winpr/libwinpr/crypto/md5.c b/winpr/libwinpr/crypto/md5.c index 7ad62230b..f98a54229 100644 --- a/winpr/libwinpr/crypto/md5.c +++ b/winpr/libwinpr/crypto/md5.c @@ -92,15 +92,15 @@ */ static const void* body(WINPR_MD5_CTX* ctx, const void* data, unsigned long size) { - const unsigned char* ptr; - winpr_MD5_u32plus a; - winpr_MD5_u32plus b; - winpr_MD5_u32plus c; - winpr_MD5_u32plus d; - winpr_MD5_u32plus saved_a; - winpr_MD5_u32plus saved_b; - winpr_MD5_u32plus saved_c; - winpr_MD5_u32plus saved_d; + const unsigned char* ptr = NULL; + winpr_MD5_u32plus a = 0; + winpr_MD5_u32plus b = 0; + winpr_MD5_u32plus c = 0; + winpr_MD5_u32plus d = 0; + winpr_MD5_u32plus saved_a = 0; + winpr_MD5_u32plus saved_b = 0; + winpr_MD5_u32plus saved_c = 0; + winpr_MD5_u32plus saved_d = 0; ptr = (const unsigned char*)data; @@ -217,9 +217,9 @@ void winpr_MD5_Init(WINPR_MD5_CTX* ctx) void winpr_MD5_Update(WINPR_MD5_CTX* ctx, const void* data, unsigned long size) { - winpr_MD5_u32plus saved_lo; - unsigned long used; - unsigned long available; + winpr_MD5_u32plus saved_lo = 0; + unsigned long used = 0; + unsigned long available = 0; saved_lo = ctx->lo; if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo) @@ -261,8 +261,8 @@ void winpr_MD5_Update(WINPR_MD5_CTX* ctx, const void* data, unsigned long size) void winpr_MD5_Final(unsigned char* result, WINPR_MD5_CTX* ctx) { - unsigned long used; - unsigned long available; + unsigned long used = 0; + unsigned long available = 0; used = ctx->lo & 0x3f; diff --git a/winpr/libwinpr/crypto/test/TestCryptoCertEnumCertificatesInStore.c b/winpr/libwinpr/crypto/test/TestCryptoCertEnumCertificatesInStore.c index 071fe6fb7..6b40c8d96 100644 --- a/winpr/libwinpr/crypto/test/TestCryptoCertEnumCertificatesInStore.c +++ b/winpr/libwinpr/crypto/test/TestCryptoCertEnumCertificatesInStore.c @@ -14,9 +14,9 @@ int TestCryptoCertEnumCertificatesInStore(int argc, char* argv[]) { - int index; - DWORD status; - LPTSTR pszNameString; + int index = 0; + DWORD status = 0; + LPTSTR pszNameString = NULL; HCERTSTORE hCertStore = NULL; PCCERT_CONTEXT pCertContext = NULL; diff --git a/winpr/libwinpr/crypto/test/TestCryptoCipher.c b/winpr/libwinpr/crypto/test/TestCryptoCipher.c index 51e0e5450..518b443d0 100644 --- a/winpr/libwinpr/crypto/test/TestCryptoCipher.c +++ b/winpr/libwinpr/crypto/test/TestCryptoCipher.c @@ -6,15 +6,15 @@ static BOOL test_crypto_cipher_aes_128_cbc(void) { - WINPR_CIPHER_CTX* ctx; + WINPR_CIPHER_CTX* ctx = NULL; BOOL result = FALSE; BYTE key[] = "0123456789abcdeF"; BYTE iv[] = "1234567887654321"; BYTE ibuf[1024] = { 0 }; BYTE obuf[1024] = { 0 }; - size_t ilen; - size_t olen; - size_t xlen; + size_t ilen = 0; + size_t olen = 0; + size_t xlen = 0; const char plaintext[] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do " "eiusmod tempor incididunt ut labore et dolore magna aliqua."; @@ -112,10 +112,10 @@ static const BYTE* TEST_RC4_CIPHERTEXT = (BYTE*)"\xBB\xF3\x16\xE8\xD9\x40\xAF\x0 static BOOL test_crypto_cipher_rc4(void) { - size_t len; + size_t len = 0; BOOL rc = FALSE; BYTE* text = NULL; - WINPR_RC4_CTX* ctx; + WINPR_RC4_CTX* ctx = NULL; len = strnlen(TEST_RC4_PLAINTEXT, sizeof(TEST_RC4_PLAINTEXT)); @@ -141,8 +141,8 @@ static BOOL test_crypto_cipher_rc4(void) if (memcmp(text, TEST_RC4_CIPHERTEXT, len) != 0) { - char* actual; - char* expected; + char* actual = NULL; + char* expected = NULL; actual = winpr_BinToHexString(text, len, FALSE); expected = winpr_BinToHexString(TEST_RC4_CIPHERTEXT, len, FALSE); @@ -177,7 +177,7 @@ static const BYTE* TEST_CIPHER_IV = static BOOL test_crypto_cipher_key(void) { - int status; + int status = 0; BYTE key[32] = { 0 }; BYTE iv[16] = { 0 }; BYTE salt[8] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 }; @@ -187,10 +187,10 @@ static BOOL test_crypto_cipher_key(void) if (status != 32 || memcmp(key, TEST_CIPHER_KEY, 32) || memcmp(iv, TEST_CIPHER_IV, 16)) { - char* akstr; - char* ekstr; - char* aivstr; - char* eivstr; + char* akstr = NULL; + char* ekstr = NULL; + char* aivstr = NULL; + char* eivstr = NULL; akstr = winpr_BinToHexString(key, 32, 0); ekstr = winpr_BinToHexString(TEST_CIPHER_KEY, 32, 0); diff --git a/winpr/libwinpr/crypto/test/TestCryptoHash.c b/winpr/libwinpr/crypto/test/TestCryptoHash.c index b7f567b4c..3057b9fa8 100644 --- a/winpr/libwinpr/crypto/test/TestCryptoHash.c +++ b/winpr/libwinpr/crypto/test/TestCryptoHash.c @@ -12,7 +12,7 @@ static BOOL test_crypto_hash_md5(void) { BOOL result = FALSE; BYTE hash[WINPR_MD5_DIGEST_LENGTH] = { 0 }; - WINPR_DIGEST_CTX* ctx; + WINPR_DIGEST_CTX* ctx = NULL; if (!(ctx = winpr_Digest_New())) { @@ -37,8 +37,8 @@ static BOOL test_crypto_hash_md5(void) } if (memcmp(hash, TEST_MD5_HASH, WINPR_MD5_DIGEST_LENGTH) != 0) { - char* actual; - char* expected; + char* actual = NULL; + char* expected = NULL; actual = winpr_BinToHexString(hash, WINPR_MD5_DIGEST_LENGTH, FALSE); expected = winpr_BinToHexString(TEST_MD5_HASH, WINPR_MD5_DIGEST_LENGTH, FALSE); @@ -65,7 +65,7 @@ static BOOL test_crypto_hash_md4(void) { BOOL result = FALSE; BYTE hash[WINPR_MD4_DIGEST_LENGTH] = { 0 }; - WINPR_DIGEST_CTX* ctx; + WINPR_DIGEST_CTX* ctx = NULL; if (!(ctx = winpr_Digest_New())) { @@ -90,8 +90,8 @@ static BOOL test_crypto_hash_md4(void) } if (memcmp(hash, TEST_MD4_HASH, WINPR_MD4_DIGEST_LENGTH) != 0) { - char* actual; - char* expected; + char* actual = NULL; + char* expected = NULL; actual = winpr_BinToHexString(hash, WINPR_MD4_DIGEST_LENGTH, FALSE); expected = winpr_BinToHexString(TEST_MD4_HASH, WINPR_MD4_DIGEST_LENGTH, FALSE); @@ -118,7 +118,7 @@ static BOOL test_crypto_hash_sha1(void) { BOOL result = FALSE; BYTE hash[WINPR_SHA1_DIGEST_LENGTH] = { 0 }; - WINPR_DIGEST_CTX* ctx; + WINPR_DIGEST_CTX* ctx = NULL; if (!(ctx = winpr_Digest_New())) { @@ -144,8 +144,8 @@ static BOOL test_crypto_hash_sha1(void) if (memcmp(hash, TEST_SHA1_HASH, WINPR_MD5_DIGEST_LENGTH) != 0) { - char* actual; - char* expected; + char* actual = NULL; + char* expected = NULL; actual = winpr_BinToHexString(hash, WINPR_SHA1_DIGEST_LENGTH, FALSE); expected = winpr_BinToHexString(TEST_SHA1_HASH, WINPR_SHA1_DIGEST_LENGTH, FALSE); @@ -173,7 +173,7 @@ static const BYTE TEST_HMAC_MD5_HASH[] = static BOOL test_crypto_hash_hmac_md5(void) { BYTE hash[WINPR_MD5_DIGEST_LENGTH] = { 0 }; - WINPR_HMAC_CTX* ctx; + WINPR_HMAC_CTX* ctx = NULL; BOOL result = FALSE; if (!(ctx = winpr_HMAC_New())) @@ -207,8 +207,8 @@ static BOOL test_crypto_hash_hmac_md5(void) if (memcmp(hash, TEST_HMAC_MD5_HASH, WINPR_MD5_DIGEST_LENGTH) != 0) { - char* actual; - char* expected; + char* actual = NULL; + char* expected = NULL; actual = winpr_BinToHexString(hash, WINPR_MD5_DIGEST_LENGTH, FALSE); expected = winpr_BinToHexString(TEST_HMAC_MD5_HASH, WINPR_MD5_DIGEST_LENGTH, FALSE); @@ -236,7 +236,7 @@ static const BYTE TEST_HMAC_SHA1_HASH[] = static BOOL test_crypto_hash_hmac_sha1(void) { BYTE hash[WINPR_SHA1_DIGEST_LENGTH] = { 0 }; - WINPR_HMAC_CTX* ctx; + WINPR_HMAC_CTX* ctx = NULL; BOOL result = FALSE; if (!(ctx = winpr_HMAC_New())) @@ -270,8 +270,8 @@ static BOOL test_crypto_hash_hmac_sha1(void) if (memcmp(hash, TEST_HMAC_SHA1_HASH, WINPR_SHA1_DIGEST_LENGTH) != 0) { - char* actual; - char* expected; + char* actual = NULL; + char* expected = NULL; actual = winpr_BinToHexString(hash, WINPR_SHA1_DIGEST_LENGTH, FALSE); expected = winpr_BinToHexString(TEST_HMAC_SHA1_HASH, WINPR_SHA1_DIGEST_LENGTH, FALSE); diff --git a/winpr/libwinpr/crypto/test/TestCryptoProtectMemory.c b/winpr/libwinpr/crypto/test/TestCryptoProtectMemory.c index fea9f5f66..d904c7f70 100644 --- a/winpr/libwinpr/crypto/test/TestCryptoProtectMemory.c +++ b/winpr/libwinpr/crypto/test/TestCryptoProtectMemory.c @@ -9,10 +9,10 @@ static const char* SECRET_PASSWORD_TEST = "MySecretPassword123!"; int TestCryptoProtectMemory(int argc, char* argv[]) { - UINT32 cbPlainText; - UINT32 cbCipherText; - const char* pPlainText; - BYTE* pCipherText; + UINT32 cbPlainText = 0; + UINT32 cbCipherText = 0; + const char* pPlainText = NULL; + BYTE* pCipherText = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/crypto/test/TestCryptoRand.c b/winpr/libwinpr/crypto/test/TestCryptoRand.c index 144b12d2b..7dde55e95 100644 --- a/winpr/libwinpr/crypto/test/TestCryptoRand.c +++ b/winpr/libwinpr/crypto/test/TestCryptoRand.c @@ -5,7 +5,7 @@ int TestCryptoRand(int argc, char* argv[]) { - char* str; + char* str = NULL; BYTE rnd[16] = { 0 }; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/dsparse/dsparse.c b/winpr/libwinpr/dsparse/dsparse.c index 9099bcb73..e1e41321f 100644 --- a/winpr/libwinpr/dsparse/dsparse.c +++ b/winpr/libwinpr/dsparse/dsparse.c @@ -53,7 +53,7 @@ DWORD DsMakeSpnW(LPCWSTR ServiceClass, LPCWSTR ServiceName, LPCWSTR InstanceName char* InstanceNameA = NULL; char* ReferrerA = NULL; char* pszSpnA = NULL; - size_t length; + size_t length = 0; WINPR_ASSERT(ServiceClass); WINPR_ASSERT(ServiceName); @@ -108,9 +108,9 @@ fail: DWORD DsMakeSpnA(LPCSTR ServiceClass, LPCSTR ServiceName, LPCSTR InstanceName, USHORT InstancePort, LPCSTR Referrer, DWORD* pcSpnLength, LPSTR pszSpn) { - DWORD SpnLength; - DWORD ServiceClassLength; - DWORD ServiceNameLength; + DWORD SpnLength = 0; + DWORD ServiceClassLength = 0; + DWORD ServiceNameLength = 0; WINPR_ASSERT(ServiceClass); WINPR_ASSERT(ServiceName); diff --git a/winpr/libwinpr/dsparse/test/TestDsMakeSpn.c b/winpr/libwinpr/dsparse/test/TestDsMakeSpn.c index 1def78fa0..dcaf6350e 100644 --- a/winpr/libwinpr/dsparse/test/TestDsMakeSpn.c +++ b/winpr/libwinpr/dsparse/test/TestDsMakeSpn.c @@ -12,7 +12,7 @@ static BOOL test_DsMakeSpnA(void) LPCSTR testSpn = "HTTP/LAB1-W2K8R2-GW.lab1.awake.local"; BOOL rc = FALSE; CHAR Spn[100] = { 0 }; - DWORD status; + DWORD status = 0; DWORD SpnLength = -1; status = DsMakeSpnA(testServiceClass, testServiceName, NULL, 0, NULL, &SpnLength, NULL); @@ -73,7 +73,7 @@ static BOOL test_DsMakeSpnW(void) BOOL rc = FALSE; WCHAR Spn[100] = { 0 }; - DWORD status; + DWORD status = 0; DWORD SpnLength = -1; ConvertUtf8NToWChar(ctestServiceClass, ARRAYSIZE(ctestServiceClass), testServiceClass, diff --git a/winpr/libwinpr/environment/environment.c b/winpr/libwinpr/environment/environment.c index 45e440cbd..c5da089f1 100644 --- a/winpr/libwinpr/environment/environment.c +++ b/winpr/libwinpr/environment/environment.c @@ -46,8 +46,8 @@ DWORD GetCurrentDirectoryA(DWORD nBufferLength, LPSTR lpBuffer) { - char* cwd; - size_t length; + char* cwd = NULL; + size_t length = 0; cwd = getcwd(NULL, 0); @@ -136,7 +136,7 @@ BOOL NeedCurrentDirectoryForExePathW(LPCWSTR ExeName) DWORD GetEnvironmentVariableA(LPCSTR lpName, LPSTR lpBuffer, DWORD nSize) { #if !defined(_UWP) - size_t length; + size_t length = 0; char* env = NULL; env = getenv(lpName); @@ -217,12 +217,12 @@ extern char** environ; LPCH GetEnvironmentStringsA(VOID) { #if !defined(_UWP) - char* p; - size_t offset; - size_t length; - char** envp; - DWORD cchEnvironmentBlock; - LPCH lpszEnvironmentBlock; + char* p = NULL; + size_t offset = 0; + size_t length = 0; + char** envp = NULL; + DWORD cchEnvironmentBlock = 0; + LPCH lpszEnvironmentBlock = NULL; offset = 0; envp = environ; @@ -238,8 +238,8 @@ LPCH GetEnvironmentStringsA(VOID) while ((offset + length + 8) > cchEnvironmentBlock) { - DWORD new_size; - LPCH new_blk; + DWORD new_size = 0; + LPCH new_blk = NULL; new_size = cchEnvironmentBlock * 2; new_blk = (LPCH)realloc(lpszEnvironmentBlock, new_size * sizeof(CHAR)); @@ -311,20 +311,20 @@ BOOL FreeEnvironmentStringsW(LPWCH lpszEnvironmentBlock) LPCH MergeEnvironmentStrings(PCSTR original, PCSTR merge) { - const char* cp; - char* p; - size_t offset; - size_t length; - const char* envp; - DWORD cchEnvironmentBlock; - LPCH lpszEnvironmentBlock; - const char** mergeStrings; - size_t mergeStringLength; + const char* cp = NULL; + char* p = NULL; + size_t offset = 0; + size_t length = 0; + const char* envp = NULL; + DWORD cchEnvironmentBlock = 0; + LPCH lpszEnvironmentBlock = NULL; + const char** mergeStrings = NULL; + size_t mergeStringLength = 0; size_t mergeArraySize = 128; - size_t run; - size_t mergeLength; - size_t foundMerge; - char* foundEquals; + size_t run = 0; + size_t mergeLength = 0; + size_t foundMerge = 0; + char* foundEquals = NULL; mergeStrings = (LPCSTR*)calloc(mergeArraySize, sizeof(char*)); @@ -341,7 +341,7 @@ LPCH MergeEnvironmentStrings(PCSTR original, PCSTR merge) if (mergeStringLength == mergeArraySize) { - const char** new_str; + const char** new_str = NULL; mergeArraySize += 128; new_str = (const char**)realloc((void*)mergeStrings, mergeArraySize * sizeof(char*)); @@ -493,11 +493,11 @@ DWORD GetEnvironmentVariableEBA(LPCSTR envBlock, LPCSTR lpName, LPSTR lpBuffer, { size_t vLength = 0; char* env = NULL; - char* foundEquals; + char* foundEquals = NULL; const char* penvb = envBlock; - size_t nLength; - size_t fLength; - size_t lpNameLength; + size_t nLength = 0; + size_t fLength = 0; + size_t lpNameLength = 0; if (!lpName || NULL == envBlock) return 0; @@ -552,9 +552,9 @@ DWORD GetEnvironmentVariableEBA(LPCSTR envBlock, LPCSTR lpName, LPSTR lpBuffer, BOOL SetEnvironmentVariableEBA(LPSTR* envBlock, LPCSTR lpName, LPCSTR lpValue) { - size_t length; - char* envstr; - char* newEB; + size_t length = 0; + char* envstr = NULL; + char* newEB = NULL; if (!lpName) return FALSE; @@ -594,10 +594,10 @@ BOOL SetEnvironmentVariableEBA(LPSTR* envBlock, LPCSTR lpName, LPCSTR lpValue) char** EnvironmentBlockToEnvpA(LPCH lpszEnvironmentBlock) { - char* p; - SSIZE_T index; - size_t count; - size_t length; + char* p = NULL; + SSIZE_T index = 0; + size_t count = 0; + size_t length = 0; char** envp = NULL; count = 0; diff --git a/winpr/libwinpr/environment/test/TestEnvironmentGetEnvironmentStrings.c b/winpr/libwinpr/environment/test/TestEnvironmentGetEnvironmentStrings.c index 6af6a410a..c5963998e 100644 --- a/winpr/libwinpr/environment/test/TestEnvironmentGetEnvironmentStrings.c +++ b/winpr/libwinpr/environment/test/TestEnvironmentGetEnvironmentStrings.c @@ -7,9 +7,9 @@ int TestEnvironmentGetEnvironmentStrings(int argc, char* argv[]) { int r = -1; - TCHAR* p; - size_t length; - LPTCH lpszEnvironmentBlock; + TCHAR* p = NULL; + size_t length = 0; + LPTCH lpszEnvironmentBlock = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/environment/test/TestEnvironmentGetSetEB.c b/winpr/libwinpr/environment/test/TestEnvironmentGetSetEB.c index 072861694..603b4c2f0 100644 --- a/winpr/libwinpr/environment/test/TestEnvironmentGetSetEB.c +++ b/winpr/libwinpr/environment/test/TestEnvironmentGetSetEB.c @@ -10,7 +10,7 @@ int TestEnvironmentGetSetEB(int argc, char* argv[]) #ifndef _WIN32 char test[1024]; TCHAR* p = NULL; - DWORD length; + DWORD length = 0; LPTCH lpszEnvironmentBlock = "SHELL=123\0test=1\0test1=2\0DISPLAY=WINPR_TEST_VALUE\0\0"; LPTCH lpszEnvironmentBlockNew = NULL; diff --git a/winpr/libwinpr/environment/test/TestEnvironmentMergeEnvironmentStrings.c b/winpr/libwinpr/environment/test/TestEnvironmentMergeEnvironmentStrings.c index cfb13879b..428418d2b 100644 --- a/winpr/libwinpr/environment/test/TestEnvironmentMergeEnvironmentStrings.c +++ b/winpr/libwinpr/environment/test/TestEnvironmentMergeEnvironmentStrings.c @@ -7,11 +7,11 @@ int TestEnvironmentMergeEnvironmentStrings(int argc, char* argv[]) { #ifndef _WIN32 - TCHAR* p; - size_t length; - LPTCH lpszEnvironmentBlock; + TCHAR* p = NULL; + size_t length = 0; + LPTCH lpszEnvironmentBlock = NULL; LPTCH lpsz2Merge = "SHELL=123\0test=1\0test1=2\0DISPLAY=:77\0\0"; - LPTCH lpszMergedEnvironmentBlock; + LPTCH lpszMergedEnvironmentBlock = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/environment/test/TestEnvironmentSetEnvironmentVariable.c b/winpr/libwinpr/environment/test/TestEnvironmentSetEnvironmentVariable.c index 8a0a9e198..04b706411 100644 --- a/winpr/libwinpr/environment/test/TestEnvironmentSetEnvironmentVariable.c +++ b/winpr/libwinpr/environment/test/TestEnvironmentSetEnvironmentVariable.c @@ -10,7 +10,7 @@ int TestEnvironmentSetEnvironmentVariable(int argc, char* argv[]) { int rc = -1; - DWORD nSize; + DWORD nSize = 0; LPSTR lpBuffer = NULL; DWORD error = 0; diff --git a/winpr/libwinpr/error/test/TestErrorSetLastError.c b/winpr/libwinpr/error/test/TestErrorSetLastError.c index def2e574c..872ea2321 100644 --- a/winpr/libwinpr/error/test/TestErrorSetLastError.c +++ b/winpr/libwinpr/error/test/TestErrorSetLastError.c @@ -33,9 +33,9 @@ static BOOL bStopTest = FALSE; static DWORD WINAPI test_error_thread(LPVOID arg) { - int id; - DWORD dwErrorSet; - DWORD dwErrorGet; + int id = 0; + DWORD dwErrorSet = 0; + DWORD dwErrorGet = 0; id = (int)(size_t)arg; @@ -60,9 +60,9 @@ static DWORD WINAPI test_error_thread(LPVOID arg) int TestErrorSetLastError(int argc, char* argv[]) { - DWORD error; + DWORD error = 0; HANDLE threads[4]; - int i; + int i = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/file/file.c b/winpr/libwinpr/file/file.c index 8a411427b..753e69787 100644 --- a/winpr/libwinpr/file/file.c +++ b/winpr/libwinpr/file/file.c @@ -100,7 +100,7 @@ static BOOL FileCloseHandle(HANDLE handle) static BOOL FileSetEndOfFile(HANDLE hFile) { WINPR_FILE* pFile = (WINPR_FILE*)hFile; - INT64 size; + INT64 size = 0; if (!hFile) return FALSE; @@ -123,8 +123,8 @@ static DWORD FileSetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDist DWORD dwMoveMethod) { WINPR_FILE* pFile = (WINPR_FILE*)hFile; - INT64 offset; - int whence; + INT64 offset = 0; + int whence = 0; if (!hFile) return INVALID_SET_FILE_POINTER; @@ -168,7 +168,7 @@ static BOOL FileSetFilePointerEx(HANDLE hFile, LARGE_INTEGER liDistanceToMove, PLARGE_INTEGER lpNewFilePointer, DWORD dwMoveMethod) { WINPR_FILE* pFile = (WINPR_FILE*)hFile; - int whence; + int whence = 0; if (!hFile) return FALSE; @@ -205,8 +205,8 @@ static BOOL FileSetFilePointerEx(HANDLE hFile, LARGE_INTEGER liDistanceToMove, static BOOL FileRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped) { - size_t io_status; - WINPR_FILE* file; + size_t io_status = 0; + WINPR_FILE* file = NULL; BOOL status = TRUE; if (lpOverlapped) @@ -246,8 +246,8 @@ static BOOL FileRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, static BOOL FileWrite(PVOID Object, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten, LPOVERLAPPED lpOverlapped) { - size_t io_status; - WINPR_FILE* file; + size_t io_status = 0; + WINPR_FILE* file = NULL; if (lpOverlapped) { @@ -275,9 +275,9 @@ static BOOL FileWrite(PVOID Object, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrit static DWORD FileGetFileSize(HANDLE Object, LPDWORD lpFileSizeHigh) { - WINPR_FILE* file; - INT64 cur; - INT64 size; + WINPR_FILE* file = NULL; + INT64 cur = 0; + INT64 size = 0; if (!Object) return 0; @@ -331,8 +331,8 @@ static BOOL FileGetFileInformationByHandle(HANDLE hFile, { WINPR_FILE* pFile = (WINPR_FILE*)hFile; struct stat st; - UINT64 ft; - const char* lastSep; + UINT64 ft = 0; + const char* lastSep = NULL; if (!pFile) return FALSE; @@ -399,7 +399,7 @@ static BOOL FileLockFileEx(HANDLE hFile, DWORD dwFlags, DWORD dwReserved, struct flock lock; int lckcmd; #else - int lock; + int lock = 0; #endif WINPR_FILE* pFile = (WINPR_FILE*)hFile; @@ -568,7 +568,7 @@ static UINT64 FileTimeToUS(const FILETIME* ft) static BOOL FileSetFileTime(HANDLE hFile, const FILETIME* lpCreationTime, const FILETIME* lpLastAccessTime, const FILETIME* lpLastWriteTime) { - int rc; + int rc = 0; #if defined(__APPLE__) || defined(ANDROID) || defined(__FreeBSD__) || defined(KFREEBSD) struct stat buf; /* OpenBSD, NetBSD and DragonflyBSD support POSIX futimens */ @@ -737,7 +737,7 @@ static const char* FileGetMode(DWORD dwDesiredAccess, DWORD dwCreationDispositio UINT32 map_posix_err(int fs_errno) { - NTSTATUS rc; + NTSTATUS rc = 0; /* try to return NTSTATUS version of error code */ @@ -802,8 +802,8 @@ static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dw DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) { - WINPR_FILE* pFile; - BOOL create; + WINPR_FILE* pFile = NULL; + BOOL create = 0; const char* mode = FileGetMode(dwDesiredAccess, dwCreationDisposition, &create); #ifdef __sun struct flock lock; @@ -972,7 +972,7 @@ HANDLE_CREATOR* GetFileHandleCreator(void) static WINPR_FILE* FileHandle_New(FILE* fp) { - WINPR_FILE* pFile; + WINPR_FILE* pFile = NULL; char name[MAX_PATH] = { 0 }; _snprintf(name, sizeof(name), "device_%d", fileno(fp)); @@ -992,8 +992,8 @@ static WINPR_FILE* FileHandle_New(FILE* fp) HANDLE GetStdHandle(DWORD nStdHandle) { - FILE* fp; - WINPR_FILE* pFile; + FILE* fp = NULL; + WINPR_FILE* pFile = NULL; switch (nStdHandle) { @@ -1048,8 +1048,8 @@ BOOL GetDiskFreeSpaceW(LPCWSTR lpwRootPathName, LPDWORD lpSectorsPerCluster, LPDWORD lpBytesPerSector, LPDWORD lpNumberOfFreeClusters, LPDWORD lpTotalNumberOfClusters) { - LPSTR lpRootPathName; - BOOL ret; + LPSTR lpRootPathName = NULL; + BOOL ret = 0; if (!lpwRootPathName) return FALSE; @@ -1425,9 +1425,9 @@ HANDLE GetFileHandleForFileDescriptor(int fd) #ifdef _WIN32 return (HANDLE)_get_osfhandle(fd); #else /* _WIN32 */ - WINPR_FILE* pFile; - FILE* fp; - int flags; + WINPR_FILE* pFile = NULL; + FILE* fp = NULL; + int flags = 0; /* Make sure it's a valid fd */ if (fcntl(fd, F_GETFD) == -1 && errno == EBADF) diff --git a/winpr/libwinpr/file/generic.c b/winpr/libwinpr/file/generic.c index d17c6fa6c..d1ee0a3c0 100644 --- a/winpr/libwinpr/file/generic.c +++ b/winpr/libwinpr/file/generic.c @@ -233,7 +233,7 @@ HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) { - size_t i; + size_t i = 0; if (!lpFileName) return INVALID_HANDLE_VALUE; @@ -294,7 +294,7 @@ fail: BOOL DeleteFileA(LPCSTR lpFileName) { - int status; + int status = 0; status = unlink(lpFileName); return (status != -1) ? TRUE : FALSE; } @@ -318,8 +318,8 @@ fail: BOOL ReadFile(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -348,8 +348,8 @@ BOOL ReadFile(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, BOOL ReadFileEx(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPOVERLAPPED lpOverlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -370,8 +370,8 @@ BOOL ReadFileEx(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, BOOL ReadFileScatter(HANDLE hFile, FILE_SEGMENT_ELEMENT aSegmentArray[], DWORD nNumberOfBytesToRead, LPDWORD lpReserved, LPOVERLAPPED lpOverlapped) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -392,8 +392,8 @@ BOOL ReadFileScatter(HANDLE hFile, FILE_SEGMENT_ELEMENT aSegmentArray[], DWORD n BOOL WriteFile(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten, LPOVERLAPPED lpOverlapped) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -414,8 +414,8 @@ BOOL WriteFile(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, BOOL WriteFileEx(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPOVERLAPPED lpOverlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -436,8 +436,8 @@ BOOL WriteFileEx(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, BOOL WriteFileGather(HANDLE hFile, FILE_SEGMENT_ELEMENT aSegmentArray[], DWORD nNumberOfBytesToWrite, LPDWORD lpReserved, LPOVERLAPPED lpOverlapped) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -457,8 +457,8 @@ BOOL WriteFileGather(HANDLE hFile, FILE_SEGMENT_ELEMENT aSegmentArray[], BOOL FlushFileBuffers(HANDLE hFile) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -480,7 +480,7 @@ BOOL WINAPI GetFileAttributesExA(LPCSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfo { LPWIN32_FILE_ATTRIBUTE_DATA fd = lpFileInformation; WIN32_FIND_DATAA findFileData; - HANDLE hFind; + HANDLE hFind = NULL; if (!fd) return FALSE; @@ -501,7 +501,7 @@ BOOL WINAPI GetFileAttributesExA(LPCSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfo BOOL WINAPI GetFileAttributesExW(LPCWSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId, LPVOID lpFileInformation) { - BOOL ret; + BOOL ret = 0; if (!lpFileName) return FALSE; LPSTR lpCFileName = ConvertWCharToUtf8Alloc(lpFileName, NULL); @@ -520,7 +520,7 @@ BOOL WINAPI GetFileAttributesExW(LPCWSTR lpFileName, GET_FILEEX_INFO_LEVELS fInf DWORD WINAPI GetFileAttributesA(LPCSTR lpFileName) { WIN32_FIND_DATAA findFileData; - HANDLE hFind; + HANDLE hFind = NULL; if ((hFind = FindFirstFileA(lpFileName, &findFileData)) == INVALID_HANDLE_VALUE) return INVALID_FILE_ATTRIBUTES; @@ -531,7 +531,7 @@ DWORD WINAPI GetFileAttributesA(LPCSTR lpFileName) DWORD WINAPI GetFileAttributesW(LPCWSTR lpFileName) { - DWORD ret; + DWORD ret = 0; if (!lpFileName) return FALSE; LPSTR lpCFileName = ConvertWCharToUtf8Alloc(lpFileName, NULL); @@ -548,8 +548,8 @@ DWORD WINAPI GetFileAttributesW(LPCWSTR lpFileName) BOOL GetFileInformationByHandle(HANDLE hFile, LPBY_HANDLE_FILE_INFORMATION lpFileInformation) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -614,7 +614,7 @@ static const char* flagsToStr(char* buffer, size_t size, DWORD flags) BOOL SetFileAttributesA(LPCSTR lpFileName, DWORD dwFileAttributes) { struct stat st; - int fd; + int fd = 0; BOOL rc = FALSE; if (dwFileAttributes & ~FILE_ATTRIBUTE_READONLY) @@ -652,8 +652,8 @@ fail: BOOL SetFileAttributesW(LPCWSTR lpFileName, DWORD dwFileAttributes) { - BOOL ret; - LPSTR lpCFileName; + BOOL ret = 0; + LPSTR lpCFileName = NULL; if (!lpFileName) return FALSE; @@ -680,8 +680,8 @@ BOOL SetFileAttributesW(LPCWSTR lpFileName, DWORD dwFileAttributes) BOOL SetEndOfFile(HANDLE hFile) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -700,8 +700,8 @@ BOOL SetEndOfFile(HANDLE hFile) DWORD WINAPI GetFileSize(HANDLE hFile, LPDWORD lpFileSizeHigh) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -721,8 +721,8 @@ DWORD WINAPI GetFileSize(HANDLE hFile, LPDWORD lpFileSizeHigh) DWORD SetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -743,8 +743,8 @@ DWORD SetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveH BOOL SetFilePointerEx(HANDLE hFile, LARGE_INTEGER liDistanceToMove, PLARGE_INTEGER lpNewFilePointer, DWORD dwMoveMethod) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -765,8 +765,8 @@ BOOL SetFilePointerEx(HANDLE hFile, LARGE_INTEGER liDistanceToMove, PLARGE_INTEG BOOL LockFile(HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh, DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -787,8 +787,8 @@ BOOL LockFile(HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh, BOOL LockFileEx(HANDLE hFile, DWORD dwFlags, DWORD dwReserved, DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh, LPOVERLAPPED lpOverlapped) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -809,8 +809,8 @@ BOOL LockFileEx(HANDLE hFile, DWORD dwFlags, DWORD dwReserved, DWORD nNumberOfBy BOOL UnlockFile(HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh, DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -831,8 +831,8 @@ BOOL UnlockFile(HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh, BOOL UnlockFileEx(HANDLE hFile, DWORD dwReserved, DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh, LPOVERLAPPED lpOverlapped) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -853,8 +853,8 @@ BOOL UnlockFileEx(HANDLE hFile, DWORD dwReserved, DWORD nNumberOfBytesToUnlockLo BOOL WINAPI SetFileTime(HANDLE hFile, const FILETIME* lpCreationTime, const FILETIME* lpLastAccessTime, const FILETIME* lpLastWriteTime) { - ULONG Type; - WINPR_HANDLE* handle; + ULONG Type = 0; + WINPR_HANDLE* handle = NULL; if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -945,8 +945,8 @@ static BOOL is_valid_file_search_handle(HANDLE handle) static BOOL FindDataFromStat(const char* path, const struct stat* fileStat, LPWIN32_FIND_DATAA lpFindFileData) { - UINT64 ft; - char* lastSep; + UINT64 ft = 0; + char* lastSep = NULL; lpFindFileData->dwFileAttributes = 0; if (S_ISDIR(fileStat->st_mode)) @@ -1053,7 +1053,7 @@ static BOOL ConvertFindDataAToW(LPWIN32_FIND_DATAA lpFindFileDataA, HANDLE FindFirstFileW(LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFindFileData) { LPSTR utfFileName = NULL; - HANDLE h; + HANDLE h = NULL; if (!lpFileName) return FALSE; LPWIN32_FIND_DATAA fd = (LPWIN32_FIND_DATAA)calloc(1, sizeof(WIN32_FIND_DATAA)); @@ -1277,7 +1277,7 @@ fail: BOOL MoveFileExA(LPCSTR lpExistingFileName, LPCSTR lpNewFileName, DWORD dwFlags) { struct stat st; - int ret; + int ret = 0; ret = stat(lpNewFileName, &st); if ((dwFlags & MOVEFILE_REPLACE_EXISTING) == 0) diff --git a/winpr/libwinpr/file/namedPipeClient.c b/winpr/libwinpr/file/namedPipeClient.c index 7447ae30d..fbfeb35ea 100644 --- a/winpr/libwinpr/file/namedPipeClient.c +++ b/winpr/libwinpr/file/namedPipeClient.c @@ -123,11 +123,11 @@ static HANDLE NamedPipeClientCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAcces DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) { - char* name; - int status; - HANDLE hNamedPipe; + char* name = NULL; + int status = 0; + HANDLE hNamedPipe = NULL; struct sockaddr_un s = { 0 }; - WINPR_NAMED_PIPE* pNamedPipe; + WINPR_NAMED_PIPE* pNamedPipe = NULL; if (dwFlagsAndAttributes & FILE_FLAG_OVERLAPPED) { @@ -249,7 +249,7 @@ BOOL IsNamedPipeFileNameA(LPCSTR lpName) char* GetNamedPipeNameWithoutPrefixA(LPCSTR lpName) { - char* lpFileName; + char* lpFileName = NULL; if (!lpName) return NULL; @@ -263,8 +263,8 @@ char* GetNamedPipeNameWithoutPrefixA(LPCSTR lpName) char* GetNamedPipeUnixDomainSocketBaseFilePathA(void) { - char* lpTempPath; - char* lpPipePath; + char* lpTempPath = NULL; + char* lpPipePath = NULL; lpTempPath = GetKnownPath(KNOWN_PATH_TEMP); if (!lpTempPath) @@ -277,9 +277,9 @@ char* GetNamedPipeUnixDomainSocketBaseFilePathA(void) char* GetNamedPipeUnixDomainSocketFilePathA(LPCSTR lpName) { - char* lpPipePath; - char* lpFileName; - char* lpFilePath; + char* lpPipePath = NULL; + char* lpFileName = NULL; + char* lpFilePath = NULL; lpPipePath = GetNamedPipeUnixDomainSocketBaseFilePathA(); lpFileName = GetNamedPipeNameWithoutPrefixA(lpName); lpFilePath = GetCombinedPath(lpPipePath, (char*)lpFileName); @@ -291,7 +291,7 @@ char* GetNamedPipeUnixDomainSocketFilePathA(LPCSTR lpName) int GetNamePipeFileDescriptor(HANDLE hNamedPipe) { #ifndef _WIN32 - int fd; + int fd = 0; WINPR_NAMED_PIPE* pNamedPipe = (WINPR_NAMED_PIPE*)hNamedPipe; if (!NamedPipeClientIsHandled(hNamedPipe)) diff --git a/winpr/libwinpr/file/pattern.c b/winpr/libwinpr/file/pattern.c index 2fde802a0..33adf9f96 100644 --- a/winpr/libwinpr/file/pattern.c +++ b/winpr/libwinpr/file/pattern.c @@ -42,7 +42,7 @@ LPSTR FilePatternFindNextWildcardA(LPCSTR lpPattern, DWORD* pFlags) { - LPSTR lpWildcard; + LPSTR lpWildcard = NULL; *pFlags = 0; lpWildcard = strpbrk(lpPattern, "*?~"); @@ -85,7 +85,7 @@ static BOOL FilePatternMatchSubExpressionA(LPCSTR lpFileName, size_t cchFileName size_t cchX, LPCSTR lpY, size_t cchY, LPCSTR lpWildcard, LPCSTR* ppMatchEnd) { - LPCSTR lpMatch; + LPCSTR lpMatch = NULL; if (!lpFileName) return FALSE; @@ -197,15 +197,15 @@ static BOOL FilePatternMatchSubExpressionA(LPCSTR lpFileName, size_t cchFileName BOOL FilePatternMatchA(LPCSTR lpFileName, LPCSTR lpPattern) { - BOOL match; - LPCSTR lpTail; - size_t cchTail; - size_t cchPattern; - size_t cchFileName; - DWORD dwFlags; - DWORD dwNextFlags; - LPSTR lpWildcard; - LPSTR lpNextWildcard; + BOOL match = 0; + LPCSTR lpTail = NULL; + size_t cchTail = 0; + size_t cchPattern = 0; + size_t cchFileName = 0; + DWORD dwFlags = 0; + DWORD dwNextFlags = 0; + LPSTR lpWildcard = NULL; + LPSTR lpNextWildcard = NULL; /** * Wild Card Matching @@ -305,17 +305,17 @@ BOOL FilePatternMatchA(LPCSTR lpFileName, LPCSTR lpPattern) if (lpWildcard) { - LPCSTR lpX; - LPCSTR lpY; - size_t cchX; - size_t cchY; + LPCSTR lpX = NULL; + LPCSTR lpY = NULL; + size_t cchX = 0; + size_t cchY = 0; LPCSTR lpMatchEnd = NULL; - LPCSTR lpSubPattern; - size_t cchSubPattern; - LPCSTR lpSubFileName; - size_t cchSubFileName; - size_t cchWildcard; - size_t cchNextWildcard; + LPCSTR lpSubPattern = NULL; + size_t cchSubPattern = 0; + LPCSTR lpSubFileName = NULL; + size_t cchSubFileName = 0; + size_t cchWildcard = 0; + size_t cchNextWildcard = 0; cchSubPattern = cchPattern; lpSubPattern = lpPattern; cchSubFileName = cchFileName; diff --git a/winpr/libwinpr/file/test/TestFileCreateFile.c b/winpr/libwinpr/file/test/TestFileCreateFile.c index ad97ebadd..a939416c2 100644 --- a/winpr/libwinpr/file/test/TestFileCreateFile.c +++ b/winpr/libwinpr/file/test/TestFileCreateFile.c @@ -9,13 +9,13 @@ int TestFileCreateFile(int argc, char* argv[]) { - HANDLE handle; - HRESULT hr; - DWORD written; + HANDLE handle = NULL; + HRESULT hr = 0; + DWORD written = 0; const char buffer[] = "Some random text\r\njust want it done."; char cmp[sizeof(buffer)]; char sname[8192]; - LPSTR name; + LPSTR name = NULL; int rc = 0; SYSTEMTIME systemTime; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/file/test/TestFileDeleteFile.c b/winpr/libwinpr/file/test/TestFileDeleteFile.c index 9793b29bd..81f05997c 100644 --- a/winpr/libwinpr/file/test/TestFileDeleteFile.c +++ b/winpr/libwinpr/file/test/TestFileDeleteFile.c @@ -8,7 +8,7 @@ int TestFileDeleteFile(int argc, char* argv[]) { BOOL rc = FALSE; - int fd; + int fd = 0; char validA[] = "/tmp/valid-test-file-XXXXXX"; char validW[] = "/tmp/valid-test-file-XXXXXX"; WCHAR* validWW = NULL; diff --git a/winpr/libwinpr/file/test/TestFileFindNextFile.c b/winpr/libwinpr/file/test/TestFileFindNextFile.c index d4ea912e5..ebb9bec89 100644 --- a/winpr/libwinpr/file/test/TestFileFindNextFile.c +++ b/winpr/libwinpr/file/test/TestFileFindNextFile.c @@ -11,11 +11,11 @@ static TCHAR testDirectory2File2[] = _T("TestDirectory2File2"); int TestFileFindNextFile(int argc, char* argv[]) { - char* str; + char* str = NULL; size_t length = 0; - BOOL status; - HANDLE hFind; - LPTSTR BasePath; + BOOL status = 0; + HANDLE hFind = NULL; + LPTSTR BasePath = NULL; WIN32_FIND_DATA FindData; TCHAR FilePath[PATHCCH_MAX_CCH] = { 0 }; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/file/test/TestFileGetStdHandle.c b/winpr/libwinpr/file/test/TestFileGetStdHandle.c index be44b5776..79ce4ae20 100644 --- a/winpr/libwinpr/file/test/TestFileGetStdHandle.c +++ b/winpr/libwinpr/file/test/TestFileGetStdHandle.c @@ -26,9 +26,9 @@ int TestFileGetStdHandle(int argc, char* argv[]) { - HANDLE so; + HANDLE so = NULL; const char buf[] = "happy happy"; - DWORD bytesWritten; + DWORD bytesWritten = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); so = GetStdHandle(STD_OUTPUT_HANDLE); diff --git a/winpr/libwinpr/file/test/TestSetFileAttributes.c b/winpr/libwinpr/file/test/TestSetFileAttributes.c index 45dfa5990..bd85c7623 100644 --- a/winpr/libwinpr/file/test/TestSetFileAttributes.c +++ b/winpr/libwinpr/file/test/TestSetFileAttributes.c @@ -35,8 +35,8 @@ static const DWORD allflags[] = { static BOOL test_SetFileAttributesA(void) { BOOL rc = FALSE; - HANDLE handle; - DWORD x; + HANDLE handle = NULL; + DWORD x = 0; const DWORD flags[] = { 0, FILE_ATTRIBUTE_READONLY }; char* name = GetKnownSubPath(KNOWN_PATH_TEMP, "afsklhjwe4oq5iu432oijrlkejadlkhjaklhfdkahfd"); if (!name) @@ -62,7 +62,7 @@ static BOOL test_SetFileAttributesA(void) for (x = 0; x < ARRAYSIZE(flags); x++) { - DWORD attr; + DWORD attr = 0; const DWORD flag = flags[x]; const BOOL brc = SetFileAttributesA(name, flag); if (!brc) @@ -88,8 +88,8 @@ static BOOL test_SetFileAttributesW(void) { BOOL rc = FALSE; WCHAR* name = NULL; - HANDLE handle; - DWORD x; + HANDLE handle = NULL; + DWORD x = 0; const DWORD flags[] = { 0, FILE_ATTRIBUTE_READONLY }; char* base = GetKnownSubPath(KNOWN_PATH_TEMP, "afsklhjwe4oq5iu432oijrlkejadlkhjaklhfdkahfd"); if (!base) @@ -119,7 +119,7 @@ static BOOL test_SetFileAttributesW(void) for (x = 0; x < ARRAYSIZE(flags); x++) { - DWORD attr; + DWORD attr = 0; const DWORD flag = flags[x]; const BOOL brc = SetFileAttributesW(name, flag); if (!brc) diff --git a/winpr/libwinpr/handle/handle.c b/winpr/libwinpr/handle/handle.c index 996ac948c..5c35d42ad 100644 --- a/winpr/libwinpr/handle/handle.c +++ b/winpr/libwinpr/handle/handle.c @@ -42,8 +42,8 @@ BOOL CloseHandle(HANDLE hObject) { - ULONG Type; - WINPR_HANDLE* Object; + ULONG Type = 0; + WINPR_HANDLE* Object = NULL; if (!winpr_Handle_GetInfo(hObject, &Type, &Object)) return FALSE; diff --git a/winpr/libwinpr/input/keycode.c b/winpr/libwinpr/input/keycode.c index 71e652f16..6883b0116 100644 --- a/winpr/libwinpr/input/keycode.c +++ b/winpr/libwinpr/input/keycode.c @@ -849,7 +849,7 @@ static DWORD KEYCODE_TO_VKCODE_XKB[256] = { DWORD GetVirtualKeyCodeFromKeycode(DWORD keycode, WINPR_KEYCODE_TYPE type) { - DWORD vkcode; + DWORD vkcode = 0; vkcode = VK_NONE; @@ -879,9 +879,9 @@ DWORD GetVirtualKeyCodeFromKeycode(DWORD keycode, WINPR_KEYCODE_TYPE type) DWORD GetKeycodeFromVirtualKeyCode(DWORD vkcode, WINPR_KEYCODE_TYPE type) { - DWORD index; - DWORD* targetArray; - size_t targetSize; + DWORD index = 0; + DWORD* targetArray = NULL; + size_t targetSize = 0; switch (type) { diff --git a/winpr/libwinpr/input/virtualkey.c b/winpr/libwinpr/input/virtualkey.c index 839839d04..89490ac37 100644 --- a/winpr/libwinpr/input/virtualkey.c +++ b/winpr/libwinpr/input/virtualkey.c @@ -432,7 +432,7 @@ const char* GetVirtualKeyName(DWORD vkcode) DWORD GetVirtualKeyCodeFromName(const char* vkname) { - unsigned long i; + unsigned long i = 0; for (i = 0; i < ARRAYSIZE(VIRTUAL_KEY_CODE_TABLE); i++) { @@ -448,7 +448,7 @@ DWORD GetVirtualKeyCodeFromName(const char* vkname) DWORD GetVirtualKeyCodeFromXkbKeyName(const char* xkbname) { - unsigned long i; + unsigned long i = 0; for (i = 0; i < ARRAYSIZE(XKB_KEYNAME_TABLE); i++) { diff --git a/winpr/libwinpr/interlocked/interlocked.c b/winpr/libwinpr/interlocked/interlocked.c index 7d1ca0f79..6c3b0c5ea 100644 --- a/winpr/libwinpr/interlocked/interlocked.c +++ b/winpr/libwinpr/interlocked/interlocked.c @@ -109,7 +109,7 @@ WINPR_PSLIST_ENTRY InterlockedPopEntrySList(WINPR_PSLIST_HEADER ListHead) { WINPR_SLIST_HEADER old; WINPR_SLIST_HEADER newHeader; - WINPR_PSLIST_ENTRY entry; + WINPR_PSLIST_ENTRY entry = NULL; #ifdef _WIN64 while (1) @@ -400,8 +400,8 @@ BOOL IsListEmpty(const WINPR_LIST_ENTRY* ListHead) BOOL RemoveEntryList(WINPR_PLIST_ENTRY Entry) { - WINPR_PLIST_ENTRY OldFlink; - WINPR_PLIST_ENTRY OldBlink; + WINPR_PLIST_ENTRY OldFlink = NULL; + WINPR_PLIST_ENTRY OldBlink = NULL; OldFlink = Entry->Flink; OldBlink = Entry->Blink; @@ -413,7 +413,7 @@ BOOL RemoveEntryList(WINPR_PLIST_ENTRY Entry) VOID InsertHeadList(WINPR_PLIST_ENTRY ListHead, WINPR_PLIST_ENTRY Entry) { - WINPR_PLIST_ENTRY OldFlink; + WINPR_PLIST_ENTRY OldFlink = NULL; OldFlink = ListHead->Flink; Entry->Flink = OldFlink; @@ -424,8 +424,8 @@ VOID InsertHeadList(WINPR_PLIST_ENTRY ListHead, WINPR_PLIST_ENTRY Entry) WINPR_PLIST_ENTRY RemoveHeadList(WINPR_PLIST_ENTRY ListHead) { - WINPR_PLIST_ENTRY Flink; - WINPR_PLIST_ENTRY Entry; + WINPR_PLIST_ENTRY Flink = NULL; + WINPR_PLIST_ENTRY Entry = NULL; Entry = ListHead->Flink; Flink = Entry->Flink; @@ -437,7 +437,7 @@ WINPR_PLIST_ENTRY RemoveHeadList(WINPR_PLIST_ENTRY ListHead) VOID InsertTailList(WINPR_PLIST_ENTRY ListHead, WINPR_PLIST_ENTRY Entry) { - WINPR_PLIST_ENTRY OldBlink; + WINPR_PLIST_ENTRY OldBlink = NULL; OldBlink = ListHead->Blink; Entry->Flink = ListHead; @@ -448,8 +448,8 @@ VOID InsertTailList(WINPR_PLIST_ENTRY ListHead, WINPR_PLIST_ENTRY Entry) WINPR_PLIST_ENTRY RemoveTailList(WINPR_PLIST_ENTRY ListHead) { - WINPR_PLIST_ENTRY Blink; - WINPR_PLIST_ENTRY Entry; + WINPR_PLIST_ENTRY Blink = NULL; + WINPR_PLIST_ENTRY Entry = NULL; Entry = ListHead->Blink; Blink = Entry->Blink; @@ -477,7 +477,7 @@ VOID PushEntryList(WINPR_PSINGLE_LIST_ENTRY ListHead, WINPR_PSINGLE_LIST_ENTRY E WINPR_PSINGLE_LIST_ENTRY PopEntryList(WINPR_PSINGLE_LIST_ENTRY ListHead) { - WINPR_PSINGLE_LIST_ENTRY FirstEntry; + WINPR_PSINGLE_LIST_ENTRY FirstEntry = NULL; FirstEntry = ListHead->Next; diff --git a/winpr/libwinpr/interlocked/test/TestInterlockedAccess.c b/winpr/libwinpr/interlocked/test/TestInterlockedAccess.c index af4267139..d8af2d3a0 100644 --- a/winpr/libwinpr/interlocked/test/TestInterlockedAccess.c +++ b/winpr/libwinpr/interlocked/test/TestInterlockedAccess.c @@ -5,13 +5,13 @@ int TestInterlockedAccess(int argc, char* argv[]) { - int index; - LONG* Addend; - LONG* Target; - LONG oldValue; - LONG* Destination; - LONGLONG oldValue64; - LONGLONG* Destination64; + int index = 0; + LONG* Addend = NULL; + LONG* Target = NULL; + LONG oldValue = 0; + LONG* Destination = NULL; + LONGLONG oldValue64 = 0; + LONGLONG* Destination64 = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); /* InterlockedIncrement */ diff --git a/winpr/libwinpr/interlocked/test/TestInterlockedDList.c b/winpr/libwinpr/interlocked/test/TestInterlockedDList.c index 7a4f3f83a..f49e37d9c 100644 --- a/winpr/libwinpr/interlocked/test/TestInterlockedDList.c +++ b/winpr/libwinpr/interlocked/test/TestInterlockedDList.c @@ -12,10 +12,10 @@ typedef struct int TestInterlockedDList(int argc, char* argv[]) { - ULONG Count; - PLIST_ITEM pListItem; - WINPR_PLIST_ENTRY pListHead; - WINPR_PLIST_ENTRY pListEntry; + ULONG Count = 0; + PLIST_ITEM pListItem = NULL; + WINPR_PLIST_ENTRY pListHead = NULL; + WINPR_PLIST_ENTRY pListEntry = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); pListHead = (WINPR_PLIST_ENTRY)winpr_aligned_malloc(sizeof(WINPR_LIST_ENTRY), diff --git a/winpr/libwinpr/interlocked/test/TestInterlockedSList.c b/winpr/libwinpr/interlocked/test/TestInterlockedSList.c index 8962bc348..71ac8bcb1 100644 --- a/winpr/libwinpr/interlocked/test/TestInterlockedSList.c +++ b/winpr/libwinpr/interlocked/test/TestInterlockedSList.c @@ -12,9 +12,9 @@ typedef struct int TestInterlockedSList(int argc, char* argv[]) { - ULONG Count; - WINPR_PSLIST_ENTRY pFirstEntry; - WINPR_PSLIST_HEADER pListHead; + ULONG Count = 0; + WINPR_PSLIST_ENTRY pFirstEntry = NULL; + WINPR_PSLIST_HEADER pListHead = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); /* Initialize the list header to a MEMORY_ALLOCATION_ALIGNMENT boundary. */ @@ -48,7 +48,7 @@ int TestInterlockedSList(int argc, char* argv[]) /* Remove 10 items from the list and display the signature. */ for (Count = 10; Count >= 1; Count -= 1) { - PPROGRAM_ITEM pProgramItem; + PPROGRAM_ITEM pProgramItem = NULL; WINPR_PSLIST_ENTRY pListEntry = InterlockedPopEntrySList(pListHead); if (!pListEntry) diff --git a/winpr/libwinpr/io/device.c b/winpr/libwinpr/io/device.c index 1fa760350..0643acdff 100644 --- a/winpr/libwinpr/io/device.c +++ b/winpr/libwinpr/io/device.c @@ -64,7 +64,7 @@ static char* GetDeviceFileNameWithoutPrefixA(LPCSTR lpName) { - char* lpFileName; + char* lpFileName = NULL; if (!lpName) return NULL; @@ -79,8 +79,8 @@ static char* GetDeviceFileNameWithoutPrefixA(LPCSTR lpName) static char* GetDeviceFileUnixDomainSocketBaseFilePathA(void) { - char* lpTempPath; - char* lpPipePath; + char* lpTempPath = NULL; + char* lpPipePath = NULL; lpTempPath = GetKnownPath(KNOWN_PATH_TEMP); if (!lpTempPath) @@ -125,9 +125,9 @@ NTSTATUS _IoCreateDeviceEx(PDRIVER_OBJECT_EX DriverObject, ULONG DeviceExtension ULONG DeviceCharacteristics, BOOLEAN Exclusive, PDEVICE_OBJECT_EX* DeviceObject) { - int status; - char* DeviceBasePath; - DEVICE_OBJECT_EX* pDeviceObjectEx; + int status = 0; + char* DeviceBasePath = NULL; + DEVICE_OBJECT_EX* pDeviceObjectEx = NULL; DeviceBasePath = GetDeviceFileUnixDomainSocketBaseFilePathA(); if (!DeviceBasePath) @@ -219,7 +219,7 @@ NTSTATUS _IoCreateDeviceEx(PDRIVER_OBJECT_EX DriverObject, ULONG DeviceExtension VOID _IoDeleteDeviceEx(PDEVICE_OBJECT_EX DeviceObject) { - DEVICE_OBJECT_EX* pDeviceObjectEx; + DEVICE_OBJECT_EX* pDeviceObjectEx = NULL; pDeviceObjectEx = (DEVICE_OBJECT_EX*)DeviceObject; if (!pDeviceObjectEx) diff --git a/winpr/libwinpr/library/library.c b/winpr/libwinpr/library/library.c index 56c6a7fa2..307dc209a 100644 --- a/winpr/libwinpr/library/library.c +++ b/winpr/libwinpr/library/library.c @@ -121,7 +121,7 @@ HMODULE LoadLibraryA(LPCSTR lpLibFileName) free(filenameW); return hModule; #else - HMODULE library; + HMODULE library = NULL; library = dlopen(lpLibFileName, RTLD_LOCAL | RTLD_LAZY); if (!library) @@ -142,7 +142,7 @@ HMODULE LoadLibraryW(LPCWSTR lpLibFileName) #if defined(_UWP) return LoadPackagedLibrary(lpLibFileName, 0); #else - HMODULE module; + HMODULE module = NULL; char* name = ConvertWCharToUtf8Alloc(lpLibFileName, NULL); if (!name) return NULL; @@ -181,7 +181,7 @@ HMODULE LoadLibraryExW(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags) FARPROC GetProcAddress(HMODULE hModule, LPCSTR lpProcName) { - FARPROC proc; + FARPROC proc = NULL; proc = dlsym(hModule, lpProcName); if (proc == NULL) @@ -195,7 +195,7 @@ FARPROC GetProcAddress(HMODULE hModule, LPCSTR lpProcName) BOOL FreeLibrary(HMODULE hLibModule) { - int status; + int status = 0; status = dlclose(hLibModule); if (status != 0) @@ -230,7 +230,7 @@ HMODULE GetModuleHandleW(LPCWSTR lpModuleName) DWORD GetModuleFileNameW(HMODULE hModule, LPWSTR lpFilename, DWORD nSize) { - DWORD status; + DWORD status = 0; if (!lpFilename) { SetLastError(ERROR_INTERNAL_ERROR); @@ -268,8 +268,8 @@ DWORD GetModuleFileNameW(HMODULE hModule, LPWSTR lpFilename, DWORD nSize) DWORD GetModuleFileNameA(HMODULE hModule, LPSTR lpFilename, DWORD nSize) { #if defined(__linux__) - SSIZE_T status; - size_t length; + SSIZE_T status = 0; + size_t length = 0; char path[64]; if (!hModule) diff --git a/winpr/libwinpr/library/test/TestLibraryGetModuleFileName.c b/winpr/libwinpr/library/test/TestLibraryGetModuleFileName.c index 01c6f4663..714522a0d 100644 --- a/winpr/libwinpr/library/test/TestLibraryGetModuleFileName.c +++ b/winpr/libwinpr/library/test/TestLibraryGetModuleFileName.c @@ -9,7 +9,7 @@ int TestLibraryGetModuleFileName(int argc, char* argv[]) { char ModuleFileName[4096]; - DWORD len; + DWORD len = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); /* Test insufficient buffer size behaviour */ diff --git a/winpr/libwinpr/library/test/TestLibraryGetProcAddress.c b/winpr/libwinpr/library/test/TestLibraryGetProcAddress.c index b0318088f..f8f54a657 100644 --- a/winpr/libwinpr/library/test/TestLibraryGetProcAddress.c +++ b/winpr/libwinpr/library/test/TestLibraryGetProcAddress.c @@ -10,15 +10,15 @@ typedef int (*TEST_AB_FN)(int a, int b); int TestLibraryGetProcAddress(int argc, char* argv[]) { - int a; - int b; - int c; - HINSTANCE library; - TEST_AB_FN pFunctionA; - TEST_AB_FN pFunctionB; - LPCSTR SharedLibraryExtension; + int a = 0; + int b = 0; + int c = 0; + HINSTANCE library = NULL; + TEST_AB_FN pFunctionA = NULL; + TEST_AB_FN pFunctionB = NULL; + LPCSTR SharedLibraryExtension = NULL; CHAR LibraryPath[PATHCCH_MAX_CCH]; - PCHAR p; + PCHAR p = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); if (!GetModuleFileNameA(NULL, LibraryPath, PATHCCH_MAX_CCH)) diff --git a/winpr/libwinpr/library/test/TestLibraryLoadLibrary.c b/winpr/libwinpr/library/test/TestLibraryLoadLibrary.c index b12c72bcb..4bd6e7cf7 100644 --- a/winpr/libwinpr/library/test/TestLibraryLoadLibrary.c +++ b/winpr/libwinpr/library/test/TestLibraryLoadLibrary.c @@ -8,10 +8,10 @@ int TestLibraryLoadLibrary(int argc, char* argv[]) { - HINSTANCE library; - LPCSTR SharedLibraryExtension; + HINSTANCE library = NULL; + LPCSTR SharedLibraryExtension = NULL; CHAR LibraryPath[PATHCCH_MAX_CCH]; - PCHAR p; + PCHAR p = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); if (!GetModuleFileNameA(NULL, LibraryPath, PATHCCH_MAX_CCH)) diff --git a/winpr/libwinpr/ncrypt/ncrypt.c b/winpr/libwinpr/ncrypt/ncrypt.c index 4f093a806..df9c5e1e1 100644 --- a/winpr/libwinpr/ncrypt/ncrypt.c +++ b/winpr/libwinpr/ncrypt/ncrypt.c @@ -99,12 +99,12 @@ SECURITY_STATUS winpr_NCryptDefault_dtor(NCRYPT_HANDLE handle) SECURITY_STATUS NCryptEnumStorageProviders(DWORD* wProviderCount, NCryptProviderName** ppProviderList, DWORD dwFlags) { - NCryptProviderName* ret; + NCryptProviderName* ret = NULL; size_t stringAllocSize = 0; #ifdef WITH_PKCS11 - LPWSTR strPtr; + LPWSTR strPtr = NULL; static const WCHAR emptyComment[] = { 0 }; - size_t copyAmount; + size_t copyAmount = 0; #endif *wProviderCount = 0; @@ -169,7 +169,7 @@ SECURITY_STATUS winpr_NCryptOpenStorageProviderEx(NCRYPT_PROV_HANDLE* phProvider SECURITY_STATUS NCryptEnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR pszScope, NCryptKeyName** ppKeyName, PVOID* ppEnumState, DWORD dwFlags) { - SECURITY_STATUS ret; + SECURITY_STATUS ret = 0; NCryptBaseProvider* provider = (NCryptBaseProvider*)hProvider; ret = checkNCryptHandle((NCRYPT_HANDLE)hProvider, WINPR_NCRYPT_PROVIDER); @@ -182,7 +182,7 @@ SECURITY_STATUS NCryptEnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR pszScope, SECURITY_STATUS NCryptOpenKey(NCRYPT_PROV_HANDLE hProvider, NCRYPT_KEY_HANDLE* phKey, LPCWSTR pszKeyName, DWORD dwLegacyKeySpec, DWORD dwFlags) { - SECURITY_STATUS ret; + SECURITY_STATUS ret = 0; NCryptBaseProvider* provider = (NCryptBaseProvider*)hProvider; ret = checkNCryptHandle((NCRYPT_HANDLE)hProvider, WINPR_NCRYPT_PROVIDER); @@ -219,8 +219,8 @@ static NCryptKeyGetPropertyEnum propertyStringToEnum(LPCWSTR pszProperty) SECURITY_STATUS NCryptGetProperty(NCRYPT_HANDLE hObject, LPCWSTR pszProperty, PBYTE pbOutput, DWORD cbOutput, DWORD* pcbResult, DWORD dwFlags) { - NCryptKeyGetPropertyEnum property; - NCryptBaseHandle* base; + NCryptKeyGetPropertyEnum property = NCRYPT_PROPERTY_UNKNOWN; + NCryptBaseHandle* base = NULL; if (!hObject) return ERROR_INVALID_PARAMETER; @@ -238,7 +238,7 @@ SECURITY_STATUS NCryptGetProperty(NCRYPT_HANDLE hObject, LPCWSTR pszProperty, PB SECURITY_STATUS NCryptFreeObject(NCRYPT_HANDLE hObject) { - NCryptBaseHandle* base; + NCryptBaseHandle* base = NULL; SECURITY_STATUS ret = checkNCryptHandle((NCRYPT_HANDLE)hObject, WINPR_NCRYPT_INVALID); if (ret != ERROR_SUCCESS) return ret; diff --git a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c index ee23cbd34..dbd41a230 100644 --- a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c +++ b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c @@ -104,7 +104,7 @@ static CK_ATTRIBUTE public_key_filter[] = { static SECURITY_STATUS NCryptP11StorageProvider_dtor(NCRYPT_HANDLE handle) { NCryptP11ProviderHandle* provider = (NCryptP11ProviderHandle*)handle; - CK_RV rv; + CK_RV rv = 0; WINPR_ASSERT(provider); rv = provider->p11->C_Finalize(NULL); @@ -130,7 +130,7 @@ static void fix_padded_string(char* str, size_t maxlen) static BOOL attributes_have_unallocated_buffers(CK_ATTRIBUTE_PTR attributes, CK_ULONG count) { - CK_ULONG i; + CK_ULONG i = 0; for (i = 0; i < count; i++) { @@ -161,7 +161,7 @@ static BOOL attribute_allocate_buffer(CK_ATTRIBUTE_PTR attribute) static BOOL attributes_allocate_buffers(CK_ATTRIBUTE_PTR attributes, CK_ULONG count) { - CK_ULONG i; + CK_ULONG i = 0; BOOL ret = TRUE; for (i = 0; i < count; i++) @@ -193,7 +193,7 @@ static CK_RV object_load_attributes(NCryptP11ProviderHandle* provider, CK_SESSIO CK_OBJECT_HANDLE object, CK_ATTRIBUTE_PTR attributes, CK_ULONG count) { - CK_RV rv; + CK_RV rv = 0; WINPR_ASSERT(provider); WINPR_ASSERT(provider->p11); @@ -463,7 +463,7 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe static BOOL convertKeyType(CK_KEY_TYPE k, LPWSTR dest, DWORD len, DWORD* outlen) { - DWORD retLen; + DWORD retLen = 0; const WCHAR* r = NULL; #define ALGO_CASE(V, S) \ @@ -533,8 +533,8 @@ static void wprintKeyName(LPWSTR str, CK_SLOT_ID slotId, CK_BYTE* id, CK_ULONG i { char asciiName[128] = { 0 }; char* ptr = asciiName; - const CK_BYTE* bytePtr; - CK_ULONG i; + const CK_BYTE* bytePtr = NULL; + CK_ULONG i = 0; *ptr = '\\'; ptr++; @@ -608,7 +608,7 @@ static SECURITY_STATUS parseKeyName(LPCWSTR pszKeyName, CK_SLOT_ID* slotId, CK_B CK_ULONG* idLen) { char asciiKeyName[128] = { 0 }; - char* pos; + char* pos = NULL; if (ConvertWCharToUtf8(pszKeyName, asciiKeyName, ARRAYSIZE(asciiKeyName)) < 0) return NTE_BAD_KEY; @@ -658,7 +658,7 @@ static SECURITY_STATUS NCryptP11EnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR p * card reader */ char asciiScope[128 + 6 + 1] = { 0 }; - size_t asciiScopeLen; + size_t asciiScopeLen = 0; if (ConvertWCharToUtf8(pszScope, asciiScope, ARRAYSIZE(asciiScope) - 1) < 0) { @@ -732,8 +732,8 @@ static SECURITY_STATUS NCryptP11EnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR p CK_ATTRIBUTE certificateFilter[] = { { CKA_CLASS, &oclass, sizeof(oclass) }, { CKA_CERTIFICATE_TYPE, &ctype, sizeof(ctype) }, { CKA_ID, key->id, key->idLen } }; - CK_ULONG ncertObjects; - CK_OBJECT_HANDLE certObject; + CK_ULONG ncertObjects = 0; + CK_OBJECT_HANDLE certObject = 0; /* check the reader filter if any */ if (slotFilter && memcmp(key->slotInfo.slotDescription, slotFilter, slotFilterLen) != 0) @@ -782,7 +782,7 @@ static SECURITY_STATUS NCryptP11EnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR p if (ncertObjects) { /* sizeof keyName struct + "\\" + keyName->pszAlgid */ - DWORD algoSz; + DWORD algoSz = 0; size_t KEYNAME_SZ = (1 + (sizeof(key->slotId) * 2) /*slotId*/ + 1 + (key->idLen * 2) + 1) * 2; @@ -946,11 +946,11 @@ static SECURITY_STATUS NCryptP11KeyGetProperties(NCryptP11KeyHandle* keyHandle, DWORD cbOutput, DWORD* pcbResult, DWORD dwFlags) { SECURITY_STATUS ret = NTE_FAIL; - CK_RV rv; - CK_SESSION_HANDLE session; - CK_OBJECT_HANDLE objectHandle; - CK_ULONG objectCount; - NCryptP11ProviderHandle* provider; + CK_RV rv = 0; + CK_SESSION_HANDLE session = 0; + CK_OBJECT_HANDLE objectHandle = 0; + CK_ULONG objectCount = 0; + NCryptP11ProviderHandle* provider = NULL; CK_OBJECT_CLASS oclass = CKO_CERTIFICATE; CK_CERTIFICATE_TYPE ctype = CKC_X_509; CK_ATTRIBUTE certificateFilter[] = { { CKA_CLASS, &oclass, sizeof(oclass) }, @@ -1156,11 +1156,11 @@ static SECURITY_STATUS NCryptP11GetProperty(NCRYPT_HANDLE hObject, NCryptKeyGetP static SECURITY_STATUS NCryptP11OpenKey(NCRYPT_PROV_HANDLE hProvider, NCRYPT_KEY_HANDLE* phKey, LPCWSTR pszKeyName, DWORD dwLegacyKeySpec, DWORD dwFlags) { - SECURITY_STATUS ret; - CK_SLOT_ID slotId; + SECURITY_STATUS ret = 0; + CK_SLOT_ID slotId = 0; CK_BYTE keyCertId[64] = { 0 }; - CK_ULONG keyCertIdLen; - NCryptP11KeyHandle* keyHandle; + CK_ULONG keyCertIdLen = 0; + NCryptP11KeyHandle* keyHandle = NULL; ret = parseKeyName(pszKeyName, &slotId, keyCertId, &keyCertIdLen); if (ret != ERROR_SUCCESS) @@ -1184,8 +1184,8 @@ static SECURITY_STATUS initialize_pkcs11(HANDLE handle, NCRYPT_PROV_HANDLE* phProvider) { SECURITY_STATUS status = ERROR_SUCCESS; - NCryptP11ProviderHandle* ret; - CK_RV rv; + NCryptP11ProviderHandle* ret = NULL; + CK_RV rv = 0; WINPR_ASSERT(c_get_function_list); WINPR_ASSERT(phProvider); @@ -1267,7 +1267,7 @@ SECURITY_STATUS NCryptOpenP11StorageProviderEx(NCRYPT_PROV_HANDLE* phProvider, { HANDLE library = LoadLibrary(*modulePaths); typedef CK_RV (*c_get_function_list_t)(CK_FUNCTION_LIST_PTR_PTR); - c_get_function_list_t c_get_function_list; + c_get_function_list_t c_get_function_list = NULL; WLog_DBG(TAG, "Trying pkcs11-helper module '%s'", *modulePaths); if (!library) diff --git a/winpr/libwinpr/ncrypt/test/TestNCryptProviders.c b/winpr/libwinpr/ncrypt/test/TestNCryptProviders.c index 3a0be523d..ec7750db6 100644 --- a/winpr/libwinpr/ncrypt/test/TestNCryptProviders.c +++ b/winpr/libwinpr/ncrypt/test/TestNCryptProviders.c @@ -26,10 +26,10 @@ int TestNCryptProviders(int argc, char* argv[]) { - SECURITY_STATUS status; - DWORD nproviders; - DWORD i; - NCryptProviderName* providers; + SECURITY_STATUS status = 0; + DWORD nproviders = 0; + DWORD i = 0; + NCryptProviderName* providers = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/ncrypt/test/TestNCryptSmartcard.c b/winpr/libwinpr/ncrypt/test/TestNCryptSmartcard.c index 744e2e84b..b028fbc87 100644 --- a/winpr/libwinpr/ncrypt/test/TestNCryptSmartcard.c +++ b/winpr/libwinpr/ncrypt/test/TestNCryptSmartcard.c @@ -29,10 +29,10 @@ static void crypto_print_name(const BYTE* b, DWORD sz) { - X509_NAME* name; - X509* x509; - BIO* bio; - char* ret; + X509_NAME* name = NULL; + X509* x509 = NULL; + BIO* bio = NULL; + char* ret = NULL; bio = BIO_new_mem_buf(b, sz); if (!bio) @@ -63,9 +63,9 @@ bio_release: int TestNCryptSmartcard(int argc, char* argv[]) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; size_t j = 0; - DWORD providerCount; + DWORD providerCount = 0; NCryptProviderName* names = NULL; status = NCryptEnumStorageProviders(&providerCount, &names, NCRYPT_SILENT_FLAG); @@ -75,7 +75,7 @@ int TestNCryptSmartcard(int argc, char* argv[]) for (j = 0; j < providerCount; j++) { const NCryptProviderName* name = &names[j]; - NCRYPT_PROV_HANDLE provider; + NCRYPT_PROV_HANDLE provider = 0; char providerNameStr[256] = { 0 }; PVOID enumState = NULL; size_t i = 0; @@ -92,9 +92,9 @@ int TestNCryptSmartcard(int argc, char* argv[]) while ((status = NCryptEnumKeys(provider, NULL, &keyName, &enumState, NCRYPT_SILENT_FLAG)) == ERROR_SUCCESS) { - NCRYPT_KEY_HANDLE phKey; + NCRYPT_KEY_HANDLE phKey = 0; DWORD dwFlags = 0; - DWORD cbOutput; + DWORD cbOutput = 0; char keyNameStr[256] = { 0 }; WCHAR reader[1024] = { 0 }; PBYTE certBytes = NULL; diff --git a/winpr/libwinpr/nt/test/TestNtCurrentTeb.c b/winpr/libwinpr/nt/test/TestNtCurrentTeb.c index 5eac4ccd7..6ee383638 100644 --- a/winpr/libwinpr/nt/test/TestNtCurrentTeb.c +++ b/winpr/libwinpr/nt/test/TestNtCurrentTeb.c @@ -6,7 +6,7 @@ int TestNtCurrentTeb(int argc, char* argv[]) { #ifndef _WIN32 - PTEB teb; + PTEB teb = NULL; teb = NtCurrentTeb(); diff --git a/winpr/libwinpr/path/path.c b/winpr/libwinpr/path/path.c index 5f1835a67..aed979316 100644 --- a/winpr/libwinpr/path/path.c +++ b/winpr/libwinpr/path/path.c @@ -684,7 +684,7 @@ HRESULT PathCchStripToRootW(PWSTR pszPath, size_t cchPath) HRESULT PathCchStripPrefixA(PSTR pszPath, size_t cchPath) { - BOOL hasPrefix; + BOOL hasPrefix = 0; if (!pszPath) return E_INVALIDARG; @@ -719,7 +719,7 @@ HRESULT PathCchStripPrefixA(PSTR pszPath, size_t cchPath) HRESULT PathCchStripPrefixW(PWSTR pszPath, size_t cchPath) { - BOOL hasPrefix; + BOOL hasPrefix = 0; if (!pszPath) return E_INVALIDARG; @@ -734,7 +734,7 @@ HRESULT PathCchStripPrefixW(PWSTR pszPath, size_t cchPath) if (hasPrefix) { - int rc; + int rc = 0; if (cchPath < 6) return S_FALSE; @@ -783,7 +783,7 @@ HRESULT PathCchRemoveFileSpecW(PWSTR pszPath, size_t cchPath) HRESULT PathCchConvertStyleA(PSTR pszPath, size_t cchPath, unsigned long dwFlags) { - size_t index; + size_t index = 0; if (dwFlags == PATH_STYLE_WINDOWS) { @@ -835,7 +835,7 @@ HRESULT PathCchConvertStyleA(PSTR pszPath, size_t cchPath, unsigned long dwFlags HRESULT PathCchConvertStyleW(PWSTR pszPath, size_t cchPath, unsigned long dwFlags) { - size_t index; + size_t index = 0; if (dwFlags == PATH_STYLE_WINDOWS) { diff --git a/winpr/libwinpr/path/shell.c b/winpr/libwinpr/path/shell.c index d620178de..be2b207be 100644 --- a/winpr/libwinpr/path/shell.c +++ b/winpr/libwinpr/path/shell.c @@ -63,8 +63,8 @@ static char* GetPath_XDG_RUNTIME_DIR(void); char* GetEnvAlloc(LPCSTR lpName) { - DWORD nSize; - DWORD nStatus; + DWORD nSize = 0; + DWORD nStatus = 0; char* env = NULL; nSize = GetEnvironmentVariableX(lpName, NULL, 0); @@ -124,7 +124,7 @@ static char* GetPath_XDG_DATA_HOME(void) #if defined(WIN32) || defined(__IOS__) path = GetPath_XDG_CONFIG_HOME(); #else - size_t size; + size_t size = 0; char* home = NULL; /** * There is a single base directory relative to which user-specific data files should be @@ -177,7 +177,7 @@ static char* GetPath_XDG_CONFIG_HOME(void) #elif defined(__IOS__) path = ios_get_data(); #else - size_t size; + size_t size = 0; char* home = NULL; /** * There is a single base directory relative to which user-specific configuration files should @@ -235,7 +235,7 @@ static char* GetPath_XDG_CACHE_HOME(void) #elif defined(__IOS__) path = ios_get_cache(); #else - size_t size; + size_t size = 0; /** * There is a single base directory relative to which user-specific non-essential (cached) data * should be written. This directory is defined by the environment variable $XDG_CACHE_HOME. @@ -368,8 +368,8 @@ char* GetKnownPath(int id) char* GetKnownSubPath(int id, const char* path) { - char* subPath; - char* knownPath; + char* subPath = NULL; + char* knownPath = NULL; knownPath = GetKnownPath(id); if (!knownPath) @@ -383,8 +383,8 @@ char* GetKnownSubPath(int id, const char* path) char* GetEnvironmentPath(char* name) { char* env = NULL; - DWORD nSize; - DWORD nStatus; + DWORD nSize = 0; + DWORD nStatus = 0; nSize = GetEnvironmentVariableX(name, NULL, 0); if (nSize) @@ -408,8 +408,8 @@ char* GetEnvironmentPath(char* name) char* GetEnvironmentSubPath(char* name, const char* path) { - char* env; - char* subpath; + char* env = NULL; + char* subpath = NULL; env = GetEnvironmentPath(name); if (!env) @@ -422,8 +422,8 @@ char* GetEnvironmentSubPath(char* name, const char* path) char* GetCombinedPath(const char* basePath, const char* subPath) { - size_t length; - HRESULT status; + size_t length = 0; + HRESULT status = 0; char* path = NULL; char* subPathCpy = NULL; size_t basePathLength = 0; @@ -479,8 +479,8 @@ BOOL PathMakePathA(LPCSTR path, LPSECURITY_ATTRIBUTES lpAttributes) return (SHCreateDirectoryExA(NULL, path, lpAttributes) == ERROR_SUCCESS); #else const char delim = PathGetSeparatorA(PATH_STYLE_NATIVE); - char* dup; - char* p; + char* dup = NULL; + char* p = NULL; BOOL result = TRUE; /* we only operate on a non-null, absolute path */ #if defined(__OS2__) @@ -534,8 +534,8 @@ BOOL PathMakePathW(LPCWSTR path, LPSECURITY_ATTRIBUTES lpAttributes) #else const WCHAR wdelim = PathGetSeparatorW(PATH_STYLE_NATIVE); const char delim = PathGetSeparatorA(PATH_STYLE_NATIVE); - char* dup; - char* p; + char* dup = NULL; + char* p = NULL; BOOL result = TRUE; /* we only operate on a non-null, absolute path */ #if defined(__OS2__) @@ -637,7 +637,7 @@ fail: BOOL PathIsDirectoryEmptyA(LPCSTR pszPath) { - struct dirent* dp; + struct dirent* dp = NULL; int empty = 1; DIR* dir = opendir(pszPath); diff --git a/winpr/libwinpr/path/test/TestPathAllocCombine.c b/winpr/libwinpr/path/test/TestPathAllocCombine.c index c299d2825..4630df001 100644 --- a/winpr/libwinpr/path/test/TestPathAllocCombine.c +++ b/winpr/libwinpr/path/test/TestPathAllocCombine.c @@ -14,8 +14,8 @@ static const TCHAR testPathOutMorePathBackslash[] = _T("C:\\Microsoft Visual Stu int TestPathAllocCombine(int argc, char* argv[]) { - HRESULT status; - LPTSTR PathOut; + HRESULT status = 0; + LPTSTR PathOut = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/path/test/TestPathCchAddBackslash.c b/winpr/libwinpr/path/test/TestPathCchAddBackslash.c index 7ee612d47..0a414e297 100644 --- a/winpr/libwinpr/path/test/TestPathCchAddBackslash.c +++ b/winpr/libwinpr/path/test/TestPathCchAddBackslash.c @@ -10,7 +10,7 @@ static const TCHAR testPathNoBackslash[] = _T("C:\\Program Files"); int TestPathCchAddBackslash(int argc, char* argv[]) { - HRESULT status; + HRESULT status = 0; TCHAR Path[PATHCCH_MAX_CCH]; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/path/test/TestPathCchAddBackslashEx.c b/winpr/libwinpr/path/test/TestPathCchAddBackslashEx.c index b4becce70..4a842007b 100644 --- a/winpr/libwinpr/path/test/TestPathCchAddBackslashEx.c +++ b/winpr/libwinpr/path/test/TestPathCchAddBackslashEx.c @@ -10,9 +10,9 @@ static const TCHAR testPathNoBackslash[] = _T("C:\\Program Files"); int TestPathCchAddBackslashEx(int argc, char* argv[]) { - HRESULT status; - LPTSTR pszEnd; - size_t cchRemaining; + HRESULT status = 0; + LPTSTR pszEnd = NULL; + size_t cchRemaining = 0; TCHAR Path[PATHCCH_MAX_CCH]; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/path/test/TestPathCchAddExtension.c b/winpr/libwinpr/path/test/TestPathCchAddExtension.c index fcb70bd83..71f5ddf75 100644 --- a/winpr/libwinpr/path/test/TestPathCchAddExtension.c +++ b/winpr/libwinpr/path/test/TestPathCchAddExtension.c @@ -12,7 +12,7 @@ static const TCHAR testPathExtension[] = _T("C:\\Windows\\System32\\cmd.exe"); int TestPathCchAddExtension(int argc, char* argv[]) { - HRESULT status; + HRESULT status = 0; TCHAR Path[PATHCCH_MAX_CCH]; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/path/test/TestPathCchAppend.c b/winpr/libwinpr/path/test/TestPathCchAppend.c index e7bf9a643..fc22dcd4f 100644 --- a/winpr/libwinpr/path/test/TestPathCchAppend.c +++ b/winpr/libwinpr/path/test/TestPathCchAppend.c @@ -13,9 +13,9 @@ static const TCHAR testPathOut[] = _T("C:\\Program Files\\Microsoft Visual Studi int TestPathCchAppend(int argc, char* argv[]) { - HRESULT status; + HRESULT status = 0; TCHAR Path[PATHCCH_MAX_CCH]; - size_t i; + size_t i = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/path/test/TestPathCchFindExtension.c b/winpr/libwinpr/path/test/TestPathCchFindExtension.c index 812bfaeda..f4b4151a8 100644 --- a/winpr/libwinpr/path/test/TestPathCchFindExtension.c +++ b/winpr/libwinpr/path/test/TestPathCchFindExtension.c @@ -8,9 +8,9 @@ static const char testPathExtension[] = "C:\\Windows\\System32\\cmd.exe"; int TestPathCchFindExtension(int argc, char* argv[]) { - PCSTR pszExt; - PCSTR pszTmp; - HRESULT hr; + PCSTR pszExt = NULL; + PCSTR pszTmp = NULL; + HRESULT hr = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/path/test/TestPathCchStripPrefix.c b/winpr/libwinpr/path/test/TestPathCchStripPrefix.c index 896b4378b..42382ebb9 100644 --- a/winpr/libwinpr/path/test/TestPathCchStripPrefix.c +++ b/winpr/libwinpr/path/test/TestPathCchStripPrefix.c @@ -19,9 +19,9 @@ static const TCHAR testPathPrefixDeviceNamespace[] = _T("\\\\?\\GLOBALROOT"); int TestPathCchStripPrefix(int argc, char* argv[]) { - HRESULT status; + HRESULT status = 0; TCHAR Path[PATHCCH_MAX_CCH]; - int i; + int i = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/path/test/TestPathIsUNCEx.c b/winpr/libwinpr/path/test/TestPathIsUNCEx.c index a9cb16474..4fdf4f7a2 100644 --- a/winpr/libwinpr/path/test/TestPathIsUNCEx.c +++ b/winpr/libwinpr/path/test/TestPathIsUNCEx.c @@ -11,8 +11,8 @@ static const TCHAR testPathNotUNC[] = _T("C:\\share\\path\\file"); int TestPathIsUNCEx(int argc, char* argv[]) { - BOOL status; - LPCTSTR Server; + BOOL status = 0; + LPCTSTR Server = NULL; TCHAR Path[PATHCCH_MAX_CCH]; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/path/test/TestPathMakePath.c b/winpr/libwinpr/path/test/TestPathMakePath.c index 0309b9a94..5e244c0aa 100644 --- a/winpr/libwinpr/path/test/TestPathMakePath.c +++ b/winpr/libwinpr/path/test/TestPathMakePath.c @@ -8,12 +8,12 @@ int TestPathMakePath(int argc, char* argv[]) { - int x; - size_t baseLen; - BOOL success; + int x = 0; + size_t baseLen = 0; + BOOL success = 0; char tmp[64] = { 0 }; char* path = NULL; - char* cur; + char* cur = NULL; char delim = PathGetSeparatorA(0); char* base = GetKnownPath(KNOWN_PATH_TEMP); diff --git a/winpr/libwinpr/path/test/TestPathShell.c b/winpr/libwinpr/path/test/TestPathShell.c index 11b3144fe..669119c4a 100644 --- a/winpr/libwinpr/path/test/TestPathShell.c +++ b/winpr/libwinpr/path/test/TestPathShell.c @@ -16,7 +16,7 @@ int TestPathShell(int argc, char* argv[]) "KNOWN_PATH_XDG_CACHE_HOME", "KNOWN_PATH_XDG_RUNTIME_DIR", "KNOWN_PATH_XDG_CONFIG_HOME" }; int rc = 0; - size_t x; + size_t x = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/pipe/pipe.c b/winpr/libwinpr/pipe/pipe.c index 7ce673c08..fb0b46e0e 100644 --- a/winpr/libwinpr/pipe/pipe.c +++ b/winpr/libwinpr/pipe/pipe.c @@ -113,8 +113,8 @@ static BOOL PipeCloseHandle(HANDLE handle) static BOOL PipeRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped) { - SSIZE_T io_status; - WINPR_PIPE* pipe; + SSIZE_T io_status = 0; + WINPR_PIPE* pipe = NULL; BOOL status = TRUE; if (lpOverlapped) @@ -152,8 +152,8 @@ static BOOL PipeRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, static BOOL PipeWrite(PVOID Object, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten, LPOVERLAPPED lpOverlapped) { - SSIZE_T io_status; - WINPR_PIPE* pipe; + SSIZE_T io_status = 0; + WINPR_PIPE* pipe = NULL; if (lpOverlapped) { @@ -249,8 +249,8 @@ static BOOL NamedPipeCloseHandle(HANDLE handle) BOOL NamedPipeRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped) { - SSIZE_T io_status; - WINPR_NAMED_PIPE* pipe; + SSIZE_T io_status = 0; + WINPR_NAMED_PIPE* pipe = NULL; BOOL status = TRUE; if (lpOverlapped) @@ -342,8 +342,8 @@ BOOL NamedPipeRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, BOOL NamedPipeWrite(PVOID Object, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten, LPOVERLAPPED lpOverlapped) { - SSIZE_T io_status; - WINPR_NAMED_PIPE* pipe; + SSIZE_T io_status = 0; + WINPR_NAMED_PIPE* pipe = NULL; BOOL status = TRUE; if (lpOverlapped) @@ -473,8 +473,8 @@ BOOL CreatePipe(PHANDLE hReadPipe, PHANDLE hWritePipe, LPSECURITY_ATTRIBUTES lpP DWORD nSize) { int pipe_fd[2]; - WINPR_PIPE* pReadPipe; - WINPR_PIPE* pWritePipe; + WINPR_PIPE* pReadPipe = NULL; + WINPR_PIPE* pWritePipe = NULL; WINPR_UNUSED(lpPipeAttributes); WINPR_UNUSED(nSize); @@ -515,8 +515,8 @@ BOOL CreatePipe(PHANDLE hReadPipe, PHANDLE hWritePipe, LPSECURITY_ATTRIBUTES lpP static void winpr_unref_named_pipe(WINPR_NAMED_PIPE* pNamedPipe) { - size_t index; - NamedPipeServerSocketEntry* baseSocket; + size_t index = 0; + NamedPipeServerSocketEntry* baseSocket = NULL; if (!pNamedPipe) return; @@ -558,8 +558,8 @@ HANDLE CreateNamedPipeA(LPCSTR lpName, DWORD dwOpenMode, DWORD dwPipeMode, DWORD DWORD nOutBufferSize, DWORD nInBufferSize, DWORD nDefaultTimeOut, LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - size_t index; - char* lpPipePath; + size_t index = 0; + char* lpPipePath = NULL; WINPR_NAMED_PIPE* pNamedPipe = NULL; int serverfd = -1; NamedPipeServerSocketEntry* baseSocket = NULL; @@ -738,9 +738,9 @@ HANDLE CreateNamedPipeW(LPCWSTR lpName, DWORD dwOpenMode, DWORD dwPipeMode, DWOR BOOL ConnectNamedPipe(HANDLE hNamedPipe, LPOVERLAPPED lpOverlapped) { - int status; - socklen_t length; - WINPR_NAMED_PIPE* pNamedPipe; + int status = 0; + socklen_t length = 0; + WINPR_NAMED_PIPE* pNamedPipe = NULL; if (lpOverlapped) { @@ -790,7 +790,7 @@ BOOL ConnectNamedPipe(HANDLE hNamedPipe, LPOVERLAPPED lpOverlapped) BOOL DisconnectNamedPipe(HANDLE hNamedPipe) { - WINPR_NAMED_PIPE* pNamedPipe; + WINPR_NAMED_PIPE* pNamedPipe = NULL; pNamedPipe = (WINPR_NAMED_PIPE*)hNamedPipe; if (pNamedPipe->clientfd != -1) @@ -821,10 +821,10 @@ BOOL TransactNamedPipe(HANDLE hNamedPipe, LPVOID lpInBuffer, DWORD nInBufferSize BOOL WaitNamedPipeA(LPCSTR lpNamedPipeName, DWORD nTimeOut) { - BOOL status; - DWORD nWaitTime; - char* lpFilePath; - DWORD dwSleepInterval; + BOOL status = 0; + DWORD nWaitTime = 0; + char* lpFilePath = NULL; + DWORD dwSleepInterval = 0; if (!lpNamedPipeName) return FALSE; @@ -867,9 +867,9 @@ BOOL WaitNamedPipeW(LPCWSTR lpNamedPipeName, DWORD nTimeOut) BOOL SetNamedPipeHandleState(HANDLE hNamedPipe, LPDWORD lpMode, LPDWORD lpMaxCollectionCount, LPDWORD lpCollectDataTimeout) { - int fd; - int flags; - WINPR_NAMED_PIPE* pNamedPipe; + int fd = 0; + int flags = 0; + WINPR_NAMED_PIPE* pNamedPipe = NULL; pNamedPipe = (WINPR_NAMED_PIPE*)hNamedPipe; if (lpMode) diff --git a/winpr/libwinpr/pipe/test/TestPipeCreateNamedPipe.c b/winpr/libwinpr/pipe/test/TestPipeCreateNamedPipe.c index 68e044338..a3579afba 100644 --- a/winpr/libwinpr/pipe/test/TestPipeCreateNamedPipe.c +++ b/winpr/libwinpr/pipe/test/TestPipeCreateNamedPipe.c @@ -29,10 +29,10 @@ static DWORD WINAPI named_pipe_client_thread(LPVOID arg) BYTE* lpReadBuffer = NULL; BYTE* lpWriteBuffer = NULL; BOOL fSuccess = FALSE; - DWORD nNumberOfBytesToRead; - DWORD nNumberOfBytesToWrite; - DWORD lpNumberOfBytesRead; - DWORD lpNumberOfBytesWritten; + DWORD nNumberOfBytesToRead = 0; + DWORD nNumberOfBytesToWrite = 0; + DWORD lpNumberOfBytesRead = 0; + DWORD lpNumberOfBytesWritten = 0; WaitForSingleObject(ReadyEvent, INFINITE); hNamedPipe = CreateFile(lpszPipeNameMt, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -100,10 +100,10 @@ static DWORD WINAPI named_pipe_server_thread(LPVOID arg) BYTE* lpWriteBuffer = NULL; BOOL fSuccess = FALSE; BOOL fConnected = FALSE; - DWORD nNumberOfBytesToRead; - DWORD nNumberOfBytesToWrite; - DWORD lpNumberOfBytesRead; - DWORD lpNumberOfBytesWritten; + DWORD nNumberOfBytesToRead = 0; + DWORD nNumberOfBytesToWrite = 0; + DWORD lpNumberOfBytesRead = 0; + DWORD lpNumberOfBytesWritten = 0; hNamedPipe = CreateNamedPipe( lpszPipeNameMt, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, PIPE_BUFFER_SIZE, PIPE_BUFFER_SIZE, 0, NULL); @@ -193,10 +193,10 @@ static DWORD WINAPI named_pipe_single_thread(LPVOID arg) { HANDLE servers[TESTNUMPIPESST] = { 0 }; HANDLE clients[TESTNUMPIPESST] = { 0 }; - DWORD dwRead; - DWORD dwWritten; - int i; - int numPipes; + DWORD dwRead = 0; + DWORD dwWritten = 0; + int i = 0; + int numPipes = 0; BOOL bSuccess = FALSE; numPipes = TESTNUMPIPESST; WaitForSingleObject(ReadyEvent, INFINITE); @@ -251,7 +251,7 @@ static DWORD WINAPI named_pipe_single_thread(LPVOID arg) for (i = 0; i < numPipes; i++) { - BOOL fConnected; + BOOL fConnected = 0; if ((clients[i] = CreateFile(lpszPipeNameSt, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE) { @@ -463,10 +463,10 @@ out: int TestPipeCreateNamedPipe(int argc, char* argv[]) { - HANDLE SingleThread; - HANDLE ClientThread; - HANDLE ServerThread; - HANDLE hPipe; + HANDLE SingleThread = NULL; + HANDLE ClientThread = NULL; + HANDLE ServerThread = NULL; + HANDLE hPipe = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); /* Verify that CreateNamedPipe returns INVALID_HANDLE_VALUE on failure */ diff --git a/winpr/libwinpr/pipe/test/TestPipeCreateNamedPipeOverlapped.c b/winpr/libwinpr/pipe/test/TestPipeCreateNamedPipeOverlapped.c index 511e4eedb..de95840d4 100644 --- a/winpr/libwinpr/pipe/test/TestPipeCreateNamedPipeOverlapped.c +++ b/winpr/libwinpr/pipe/test/TestPipeCreateNamedPipeOverlapped.c @@ -25,15 +25,15 @@ static LPTSTR lpszPipeName = _T("\\\\.\\pipe\\winpr_test_pipe_overlapped"); static DWORD WINAPI named_pipe_client_thread(LPVOID arg) { - DWORD status; + DWORD status = 0; HANDLE hEvent = NULL; HANDLE hNamedPipe = NULL; BYTE* lpReadBuffer = NULL; BOOL fSuccess = FALSE; OVERLAPPED overlapped = { 0 }; - DWORD nNumberOfBytesToRead; - DWORD nNumberOfBytesToWrite; - DWORD NumberOfBytesTransferred; + DWORD nNumberOfBytesToRead = 0; + DWORD nNumberOfBytesToWrite = 0; + DWORD NumberOfBytesTransferred = 0; WINPR_UNUSED(arg); @@ -155,16 +155,16 @@ finish: static DWORD WINAPI named_pipe_server_thread(LPVOID arg) { - DWORD status; + DWORD status = 0; HANDLE hEvent = NULL; HANDLE hNamedPipe = NULL; BYTE* lpReadBuffer = NULL; OVERLAPPED overlapped = { 0 }; BOOL fSuccess = FALSE; BOOL fConnected = FALSE; - DWORD nNumberOfBytesToRead; - DWORD nNumberOfBytesToWrite; - DWORD NumberOfBytesTransferred; + DWORD nNumberOfBytesToRead = 0; + DWORD nNumberOfBytesToWrite = 0; + DWORD NumberOfBytesTransferred = 0; WINPR_UNUSED(arg); @@ -224,7 +224,7 @@ static DWORD WINAPI named_pipe_server_thread(LPVOID arg) if (!fConnected && status == ERROR_IO_PENDING) { - DWORD dwDummy; + DWORD dwDummy = 0; printf("server: waiting up to %u ms for connection ...\n", PIPE_TIMEOUT_MS); status = WaitForSingleObject(hEvent, PIPE_TIMEOUT_MS); if (status == WAIT_OBJECT_0) diff --git a/winpr/libwinpr/pipe/test/TestPipeCreatePipe.c b/winpr/libwinpr/pipe/test/TestPipeCreatePipe.c index 45edbcf3f..db346ef91 100644 --- a/winpr/libwinpr/pipe/test/TestPipeCreatePipe.c +++ b/winpr/libwinpr/pipe/test/TestPipeCreatePipe.c @@ -9,11 +9,11 @@ int TestPipeCreatePipe(int argc, char* argv[]) { - BOOL status; - DWORD dwRead; - DWORD dwWrite; - HANDLE hReadPipe; - HANDLE hWritePipe; + BOOL status = 0; + DWORD dwRead = 0; + DWORD dwWrite = 0; + HANDLE hReadPipe = NULL; + HANDLE hWritePipe = NULL; BYTE readBuffer[BUFFER_SIZE] = { 0 }; BYTE writeBuffer[BUFFER_SIZE] = { 0 }; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/pool/pool.c b/winpr/libwinpr/pool/pool.c index a41a6d810..5e199f1b3 100644 --- a/winpr/libwinpr/pool/pool.c +++ b/winpr/libwinpr/pool/pool.c @@ -59,11 +59,11 @@ static TP_POOL DEFAULT_POOL = { static DWORD WINAPI thread_pool_work_func(LPVOID arg) { - DWORD status; - PTP_POOL pool; - PTP_WORK work; + DWORD status = 0; + PTP_POOL pool = NULL; + PTP_WORK work = NULL; HANDLE events[2]; - PTP_CALLBACK_INSTANCE callbackInstance; + PTP_CALLBACK_INSTANCE callbackInstance = NULL; pool = (PTP_POOL)arg; @@ -104,9 +104,9 @@ static void threads_close(void* thread) static BOOL InitializeThreadpool(PTP_POOL pool) { BOOL rc = FALSE; - int index; - wObject* obj; - HANDLE thread; + int index = 0; + wObject* obj = NULL; + HANDLE thread = NULL; if (pool->Threads) return TRUE; @@ -211,7 +211,7 @@ VOID winpr_CloseThreadpool(PTP_POOL ptpp) BOOL winpr_SetThreadpoolThreadMinimum(PTP_POOL ptpp, DWORD cthrdMic) { - HANDLE thread; + HANDLE thread = NULL; #ifdef _WIN32 InitOnceExecuteOnce(&init_once_module, init_module, NULL, NULL); if (pSetThreadpoolThreadMinimum) diff --git a/winpr/libwinpr/pool/test/TestPoolThread.c b/winpr/libwinpr/pool/test/TestPoolThread.c index bead1251e..d006ae6f8 100644 --- a/winpr/libwinpr/pool/test/TestPoolThread.c +++ b/winpr/libwinpr/pool/test/TestPoolThread.c @@ -16,7 +16,7 @@ int TestPoolThread(int argc, char* argv[]) { - TP_POOL* pool; + TP_POOL* pool = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/pool/test/TestPoolWork.c b/winpr/libwinpr/pool/test/TestPoolWork.c index bf43ca7f1..779e9e001 100644 --- a/winpr/libwinpr/pool/test/TestPoolWork.c +++ b/winpr/libwinpr/pool/test/TestPoolWork.c @@ -8,7 +8,7 @@ static LONG count = 0; static void CALLBACK test_WorkCallback(PTP_CALLBACK_INSTANCE instance, void* context, PTP_WORK work) { - int index; + int index = 0; printf("Hello %s: %03" PRId32 " (thread: 0x%08" PRIX32 ")\n", (char*)context, InterlockedIncrement(&count), GetCurrentThreadId()); @@ -28,8 +28,8 @@ static void CALLBACK test_WorkCallback(PTP_CALLBACK_INSTANCE instance, void* con static BOOL test1(void) { - int index; - PTP_WORK work; + int index = 0; + PTP_WORK work = NULL; printf("Global Thread Pool\n"); work = CreateThreadpoolWork(test_WorkCallback, "world", NULL); @@ -56,9 +56,9 @@ static BOOL test1(void) static BOOL test2(void) { BOOL rc = FALSE; - int index; - PTP_POOL pool; - PTP_WORK work; + int index = 0; + PTP_POOL pool = NULL; + PTP_WORK work = NULL; PTP_CLEANUP_GROUP cleanupGroup = NULL; TP_CALLBACK_ENVIRON environment; printf("Private Thread Pool\n"); diff --git a/winpr/libwinpr/pool/work.c b/winpr/libwinpr/pool/work.c index a88698623..765e90f3a 100644 --- a/winpr/libwinpr/pool/work.c +++ b/winpr/libwinpr/pool/work.c @@ -127,8 +127,8 @@ VOID winpr_CloseThreadpoolWork(PTP_WORK pwk) VOID winpr_SubmitThreadpoolWork(PTP_WORK pwk) { - PTP_POOL pool; - PTP_CALLBACK_INSTANCE callbackInstance; + PTP_POOL pool = NULL; + PTP_CALLBACK_INSTANCE callbackInstance = NULL; #ifdef _WIN32 InitOnceExecuteOnce(&init_once_module, init_module, NULL, NULL); @@ -169,8 +169,8 @@ BOOL winpr_TrySubmitThreadpoolCallback(PTP_SIMPLE_CALLBACK pfns, PVOID pv, VOID winpr_WaitForThreadpoolWorkCallbacks(PTP_WORK pwk, BOOL fCancelPendingCallbacks) { - HANDLE event; - PTP_POOL pool; + HANDLE event = NULL; + PTP_POOL pool = NULL; #ifdef _WIN32 InitOnceExecuteOnce(&init_once_module, init_module, NULL, NULL); diff --git a/winpr/libwinpr/registry/registry.c b/winpr/libwinpr/registry/registry.c index 602b48702..7422d8ba3 100644 --- a/winpr/libwinpr/registry/registry.c +++ b/winpr/libwinpr/registry/registry.c @@ -237,7 +237,7 @@ LONG RegOpenCurrentUser(REGSAM samDesired, PHKEY phkResult) LONG RegOpenKeyExW(HKEY hKey, LPCWSTR lpSubKey, DWORD ulOptions, REGSAM samDesired, PHKEY phkResult) { - LONG rc; + LONG rc = 0; char* str = ConvertWCharToUtf8Alloc(lpSubKey, NULL); if (!str) return ERROR_FILE_NOT_FOUND; @@ -308,7 +308,7 @@ LONG RegQueryInfoKeyA(HKEY hKey, LPSTR lpClass, LPDWORD lpcClass, LPDWORD lpRese static LONG reg_read_int(const RegVal* pValue, LPBYTE lpData, LPDWORD lpcbData) { const BYTE* ptr = NULL; - DWORD required; + DWORD required = 0; WINPR_ASSERT(pValue); @@ -340,7 +340,7 @@ static LONG reg_read_int(const RegVal* pValue, LPBYTE lpData, LPDWORD lpcbData) if (lpData != NULL) { - DWORD size; + DWORD size = 0; WINPR_ASSERT(lpcbData); size = *lpcbData; @@ -358,8 +358,8 @@ LONG RegQueryValueExW(HKEY hKey, LPCWSTR lpValueName, LPDWORD lpReserved, LPDWOR LPBYTE lpData, LPDWORD lpcbData) { LONG status = ERROR_FILE_NOT_FOUND; - RegKey* key; - RegVal* pValue; + RegKey* key = NULL; + RegVal* pValue = NULL; char* valueName = NULL; WINPR_UNUSED(lpReserved); @@ -392,7 +392,7 @@ LONG RegQueryValueExW(HKEY hKey, LPCWSTR lpValueName, LPDWORD lpReserved, LPDWOR if (lpData != NULL) { - DWORD size; + DWORD size = 0; union { WCHAR* wc; @@ -433,8 +433,8 @@ end: LONG RegQueryValueExA(HKEY hKey, LPCSTR lpValueName, LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData, LPDWORD lpcbData) { - RegKey* key; - RegVal* pValue; + RegKey* key = NULL; + RegVal* pValue = NULL; WINPR_UNUSED(lpReserved); @@ -463,7 +463,7 @@ LONG RegQueryValueExA(HKEY hKey, LPCSTR lpValueName, LPDWORD lpReserved, LPDWORD if (pData != NULL) { - DWORD size; + DWORD size = 0; WINPR_ASSERT(lpcbData); size = *lpcbData; diff --git a/winpr/libwinpr/registry/registry_reg.c b/winpr/libwinpr/registry/registry_reg.c index bdb32fe74..42d1a7f54 100644 --- a/winpr/libwinpr/registry/registry_reg.c +++ b/winpr/libwinpr/registry/registry_reg.c @@ -88,8 +88,8 @@ static char* reg_data_type_string(DWORD type) static BOOL reg_load_start(Reg* reg) { - char* buffer; - INT64 file_size; + char* buffer = NULL; + INT64 file_size = 0; WINPR_ASSERT(reg); WINPR_ASSERT(reg->fp); @@ -132,12 +132,12 @@ static void reg_load_finish(Reg* reg) static RegVal* reg_load_value(const Reg* reg, RegKey* key) { - size_t index; + size_t index = 0; const char* p[5] = { 0 }; - size_t length; + size_t length = 0; char* name = NULL; - const char* type; - const char* data; + const char* type = NULL; + const char* data = NULL; RegVal* value = NULL; WINPR_ASSERT(reg); @@ -197,7 +197,7 @@ static RegVal* reg_load_value(const Reg* reg, RegKey* key) { case REG_DWORD: { - unsigned long val; + unsigned long val = 0; errno = 0; val = strtoul(data, NULL, 0); @@ -211,7 +211,7 @@ static RegVal* reg_load_value(const Reg* reg, RegKey* key) break; case REG_QWORD: { - unsigned long long val; + unsigned long long val = 0; errno = 0; val = strtoull(data, NULL, 0); @@ -226,9 +226,9 @@ static RegVal* reg_load_value(const Reg* reg, RegKey* key) break; case REG_SZ: { - size_t len; - size_t cmp; - char* end; + size_t len = 0; + size_t cmp = 0; + char* end = NULL; char* start = strchr(data, '"'); if (!start) goto fail; @@ -349,8 +349,8 @@ static void reg_insert_key(Reg* reg, RegKey* key, RegKey* subkey) static RegKey* reg_load_key(Reg* reg, RegKey* key) { char* p[2]; - size_t length; - RegKey* subkey; + size_t length = 0; + RegKey* subkey = NULL; WINPR_ASSERT(reg); WINPR_ASSERT(key); @@ -451,7 +451,7 @@ static void reg_unload_value(Reg* reg, RegVal* value) static void reg_unload_key(Reg* reg, RegKey* key) { - RegVal* pValue; + RegVal* pValue = NULL; WINPR_ASSERT(reg); WINPR_ASSERT(key); diff --git a/winpr/libwinpr/rpc/rpc.c b/winpr/libwinpr/rpc/rpc.c index e031106d8..9977fd89c 100644 --- a/winpr/libwinpr/rpc/rpc.c +++ b/winpr/libwinpr/rpc/rpc.c @@ -731,7 +731,7 @@ RPC_STATUS UuidToStringW(const UUID* Uuid, RPC_WSTR* StringUuid) RPC_STATUS UuidFromStringA(RPC_CSTR StringUuid, UUID* Uuid) { - int index; + int index = 0; BYTE bin[36]; if (!StringUuid) @@ -784,7 +784,7 @@ RPC_STATUS UuidFromStringW(RPC_WSTR StringUuid, UUID* Uuid) signed int UuidCompare(const UUID* Uuid1, const UUID* Uuid2, RPC_STATUS* Status) { - int index; + int index = 0; *Status = RPC_S_OK; if (!Uuid1) diff --git a/winpr/libwinpr/shell/shell.c b/winpr/libwinpr/shell/shell.c index deac59135..244ab7ade 100644 --- a/winpr/libwinpr/shell/shell.c +++ b/winpr/libwinpr/shell/shell.c @@ -45,13 +45,13 @@ BOOL GetUserProfileDirectoryA(HANDLE hToken, LPSTR lpProfileDir, LPDWORD lpcchSize) { - char* buf; - int buflen; - int status; - DWORD cchDirSize; + char* buf = NULL; + int buflen = 0; + int status = 0; + DWORD cchDirSize = 0; struct passwd pwd; struct passwd* pw = NULL; - WINPR_ACCESS_TOKEN* token; + WINPR_ACCESS_TOKEN* token = NULL; token = (WINPR_ACCESS_TOKEN*)hToken; if (!AccessTokenIsValid(hToken)) @@ -101,9 +101,9 @@ BOOL GetUserProfileDirectoryA(HANDLE hToken, LPSTR lpProfileDir, LPDWORD lpcchSi BOOL GetUserProfileDirectoryW(HANDLE hToken, LPWSTR lpProfileDir, LPDWORD lpcchSize) { - BOOL bStatus; - DWORD cchSizeA; - LPSTR lpProfileDirA; + BOOL bStatus = 0; + DWORD cchSizeA = 0; + LPSTR lpProfileDirA = NULL; if (!lpcchSize) { diff --git a/winpr/libwinpr/smartcard/smartcard_inspect.c b/winpr/libwinpr/smartcard/smartcard_inspect.c index 5f3cdb056..6b3ffff74 100644 --- a/winpr/libwinpr/smartcard/smartcard_inspect.c +++ b/winpr/libwinpr/smartcard/smartcard_inspect.c @@ -77,7 +77,7 @@ static const SCardApiFunctionTable* g_SCardApi = NULL; static LONG WINAPI Inspect_SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, LPCVOID pvReserved2, LPSCARDCONTEXT phContext) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardEstablishContext { dwScope: %s (0x%08" PRIX32 ")", SCardGetScopeString(dwScope), dwScope); @@ -93,7 +93,7 @@ static LONG WINAPI Inspect_SCardEstablishContext(DWORD dwScope, LPCVOID pvReserv static LONG WINAPI Inspect_SCardReleaseContext(SCARDCONTEXT hContext) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardReleaseContext { hContext: %p", (void*)hContext); @@ -107,7 +107,7 @@ static LONG WINAPI Inspect_SCardReleaseContext(SCARDCONTEXT hContext) static LONG WINAPI Inspect_SCardIsValidContext(SCARDCONTEXT hContext) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardIsValidContext { hContext: %p", (void*)hContext); @@ -122,7 +122,7 @@ static LONG WINAPI Inspect_SCardIsValidContext(SCARDCONTEXT hContext) static LONG WINAPI Inspect_SCardListReaderGroupsA(SCARDCONTEXT hContext, LPSTR mszGroups, LPDWORD pcchGroups) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardListReaderGroupsA { hContext: %p", (void*)hContext); @@ -137,7 +137,7 @@ static LONG WINAPI Inspect_SCardListReaderGroupsA(SCARDCONTEXT hContext, LPSTR m static LONG WINAPI Inspect_SCardListReaderGroupsW(SCARDCONTEXT hContext, LPWSTR mszGroups, LPDWORD pcchGroups) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardListReaderGroupsW { hContext: %p", (void*)hContext); @@ -152,7 +152,7 @@ static LONG WINAPI Inspect_SCardListReaderGroupsW(SCARDCONTEXT hContext, LPWSTR static LONG WINAPI Inspect_SCardListReadersA(SCARDCONTEXT hContext, LPCSTR mszGroups, LPSTR mszReaders, LPDWORD pcchReaders) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardListReadersA { hContext: %p", (void*)hContext); @@ -168,7 +168,7 @@ static LONG WINAPI Inspect_SCardListReadersA(SCARDCONTEXT hContext, LPCSTR mszGr static LONG WINAPI Inspect_SCardListReadersW(SCARDCONTEXT hContext, LPCWSTR mszGroups, LPWSTR mszReaders, LPDWORD pcchReaders) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardListReadersW { hContext: %p", (void*)hContext); SCARDAPI_STUB_CALL_LONG(status, SCardListReadersW, hContext, mszGroups, mszReaders, @@ -183,7 +183,7 @@ static LONG WINAPI Inspect_SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, LPCGUID rgquidInterfaces, DWORD cguidInterfaceCount, CHAR* mszCards, LPDWORD pcchCards) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardListCardsA { hContext: %p", (void*)hContext); @@ -200,7 +200,7 @@ static LONG WINAPI Inspect_SCardListCardsW(SCARDCONTEXT hContext, LPCBYTE pbAtr, LPCGUID rgquidInterfaces, DWORD cguidInterfaceCount, WCHAR* mszCards, LPDWORD pcchCards) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardListCardsW { hContext: %p", (void*)hContext); @@ -216,7 +216,7 @@ static LONG WINAPI Inspect_SCardListCardsW(SCARDCONTEXT hContext, LPCBYTE pbAtr, static LONG WINAPI Inspect_SCardListInterfacesA(SCARDCONTEXT hContext, LPCSTR szCard, LPGUID pguidInterfaces, LPDWORD pcguidInterfaces) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardListInterfacesA { hContext: %p", (void*)hContext); @@ -232,7 +232,7 @@ static LONG WINAPI Inspect_SCardListInterfacesA(SCARDCONTEXT hContext, LPCSTR sz static LONG WINAPI Inspect_SCardListInterfacesW(SCARDCONTEXT hContext, LPCWSTR szCard, LPGUID pguidInterfaces, LPDWORD pcguidInterfaces) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardListInterfacesW { hContext: %p", (void*)hContext); @@ -248,7 +248,7 @@ static LONG WINAPI Inspect_SCardListInterfacesW(SCARDCONTEXT hContext, LPCWSTR s static LONG WINAPI Inspect_SCardGetProviderIdA(SCARDCONTEXT hContext, LPCSTR szCard, LPGUID pguidProviderId) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetProviderIdA { hContext: %p", (void*)hContext); @@ -263,7 +263,7 @@ static LONG WINAPI Inspect_SCardGetProviderIdA(SCARDCONTEXT hContext, LPCSTR szC static LONG WINAPI Inspect_SCardGetProviderIdW(SCARDCONTEXT hContext, LPCWSTR szCard, LPGUID pguidProviderId) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetProviderIdW { hContext: %p", (void*)hContext); @@ -279,7 +279,7 @@ static LONG WINAPI Inspect_SCardGetCardTypeProviderNameA(SCARDCONTEXT hContext, DWORD dwProviderId, CHAR* szProvider, LPDWORD pcchProvider) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetCardTypeProviderNameA { hContext: %p", (void*)hContext); @@ -296,7 +296,7 @@ static LONG WINAPI Inspect_SCardGetCardTypeProviderNameW(SCARDCONTEXT hContext, DWORD dwProviderId, WCHAR* szProvider, LPDWORD pcchProvider) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetCardTypeProviderNameW { hContext: %p", (void*)hContext); @@ -311,7 +311,7 @@ static LONG WINAPI Inspect_SCardGetCardTypeProviderNameW(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardIntroduceReaderGroupA(SCARDCONTEXT hContext, LPCSTR szGroupName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardIntroduceReaderGroupA { hContext: %p", (void*)hContext); @@ -325,7 +325,7 @@ static LONG WINAPI Inspect_SCardIntroduceReaderGroupA(SCARDCONTEXT hContext, LPC static LONG WINAPI Inspect_SCardIntroduceReaderGroupW(SCARDCONTEXT hContext, LPCWSTR szGroupName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardIntroduceReaderGroupW { hContext: %p", (void*)hContext); @@ -339,7 +339,7 @@ static LONG WINAPI Inspect_SCardIntroduceReaderGroupW(SCARDCONTEXT hContext, LPC static LONG WINAPI Inspect_SCardForgetReaderGroupA(SCARDCONTEXT hContext, LPCSTR szGroupName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardForgetReaderGroupA { hContext: %p", (void*)hContext); @@ -353,7 +353,7 @@ static LONG WINAPI Inspect_SCardForgetReaderGroupA(SCARDCONTEXT hContext, LPCSTR static LONG WINAPI Inspect_SCardForgetReaderGroupW(SCARDCONTEXT hContext, LPCWSTR szGroupName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardForgetReaderGroupW { hContext: %p", (void*)hContext); @@ -368,7 +368,7 @@ static LONG WINAPI Inspect_SCardForgetReaderGroupW(SCARDCONTEXT hContext, LPCWST static LONG WINAPI Inspect_SCardIntroduceReaderA(SCARDCONTEXT hContext, LPCSTR szReaderName, LPCSTR szDeviceName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardIntroduceReaderA { hContext: %p", (void*)hContext); @@ -383,7 +383,7 @@ static LONG WINAPI Inspect_SCardIntroduceReaderA(SCARDCONTEXT hContext, LPCSTR s static LONG WINAPI Inspect_SCardIntroduceReaderW(SCARDCONTEXT hContext, LPCWSTR szReaderName, LPCWSTR szDeviceName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardIntroduceReaderW { hContext: %p", (void*)hContext); @@ -397,7 +397,7 @@ static LONG WINAPI Inspect_SCardIntroduceReaderW(SCARDCONTEXT hContext, LPCWSTR static LONG WINAPI Inspect_SCardForgetReaderA(SCARDCONTEXT hContext, LPCSTR szReaderName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardForgetReaderA { hContext: %p", (void*)hContext); @@ -411,7 +411,7 @@ static LONG WINAPI Inspect_SCardForgetReaderA(SCARDCONTEXT hContext, LPCSTR szRe static LONG WINAPI Inspect_SCardForgetReaderW(SCARDCONTEXT hContext, LPCWSTR szReaderName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardForgetReaderW { hContext: %p", (void*)hContext); @@ -426,7 +426,7 @@ static LONG WINAPI Inspect_SCardForgetReaderW(SCARDCONTEXT hContext, LPCWSTR szR static LONG WINAPI Inspect_SCardAddReaderToGroupA(SCARDCONTEXT hContext, LPCSTR szReaderName, LPCSTR szGroupName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardAddReaderToGroupA { hContext: %p", (void*)hContext); @@ -441,7 +441,7 @@ static LONG WINAPI Inspect_SCardAddReaderToGroupA(SCARDCONTEXT hContext, LPCSTR static LONG WINAPI Inspect_SCardAddReaderToGroupW(SCARDCONTEXT hContext, LPCWSTR szReaderName, LPCWSTR szGroupName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardAddReaderToGroupW { hContext: %p", (void*)hContext); @@ -456,7 +456,7 @@ static LONG WINAPI Inspect_SCardAddReaderToGroupW(SCARDCONTEXT hContext, LPCWSTR static LONG WINAPI Inspect_SCardRemoveReaderFromGroupA(SCARDCONTEXT hContext, LPCSTR szReaderName, LPCSTR szGroupName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardRemoveReaderFromGroupA { hContext: %p", (void*)hContext); @@ -472,7 +472,7 @@ static LONG WINAPI Inspect_SCardRemoveReaderFromGroupA(SCARDCONTEXT hContext, LP static LONG WINAPI Inspect_SCardRemoveReaderFromGroupW(SCARDCONTEXT hContext, LPCWSTR szReaderName, LPCWSTR szGroupName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardRemoveReaderFromGroupW { hContext: %p", (void*)hContext); @@ -490,7 +490,7 @@ static LONG WINAPI Inspect_SCardIntroduceCardTypeA(SCARDCONTEXT hContext, LPCSTR LPCGUID rgguidInterfaces, DWORD dwInterfaceCount, LPCBYTE pbAtr, LPCBYTE pbAtrMask, DWORD cbAtrLen) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardIntroduceCardTypeA { hContext: %p", (void*)hContext); @@ -509,7 +509,7 @@ static LONG WINAPI Inspect_SCardIntroduceCardTypeW(SCARDCONTEXT hContext, LPCWST LPCGUID rgguidInterfaces, DWORD dwInterfaceCount, LPCBYTE pbAtr, LPCBYTE pbAtrMask, DWORD cbAtrLen) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardIntroduceCardTypeW { hContext: %p", (void*)hContext); @@ -526,7 +526,7 @@ static LONG WINAPI Inspect_SCardIntroduceCardTypeW(SCARDCONTEXT hContext, LPCWST static LONG WINAPI Inspect_SCardSetCardTypeProviderNameA(SCARDCONTEXT hContext, LPCSTR szCardName, DWORD dwProviderId, LPCSTR szProvider) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardSetCardTypeProviderNameA { hContext: %p", (void*)hContext); @@ -542,7 +542,7 @@ static LONG WINAPI Inspect_SCardSetCardTypeProviderNameA(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardSetCardTypeProviderNameW(SCARDCONTEXT hContext, LPCWSTR szCardName, DWORD dwProviderId, LPCWSTR szProvider) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardSetCardTypeProviderNameA { hContext: %p", (void*)hContext); @@ -557,7 +557,7 @@ static LONG WINAPI Inspect_SCardSetCardTypeProviderNameW(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardForgetCardTypeA(SCARDCONTEXT hContext, LPCSTR szCardName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardForgetCardTypeA { hContext: %p", (void*)hContext); @@ -571,7 +571,7 @@ static LONG WINAPI Inspect_SCardForgetCardTypeA(SCARDCONTEXT hContext, LPCSTR sz static LONG WINAPI Inspect_SCardForgetCardTypeW(SCARDCONTEXT hContext, LPCWSTR szCardName) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardForgetCardTypeW { hContext: %p", (void*)hContext); @@ -585,7 +585,7 @@ static LONG WINAPI Inspect_SCardForgetCardTypeW(SCARDCONTEXT hContext, LPCWSTR s static LONG WINAPI Inspect_SCardFreeMemory(SCARDCONTEXT hContext, LPVOID pvMem) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardFreeMemory { hContext: %p", (void*)hContext); @@ -599,7 +599,7 @@ static LONG WINAPI Inspect_SCardFreeMemory(SCARDCONTEXT hContext, LPVOID pvMem) static HANDLE WINAPI Inspect_SCardAccessStartedEvent(void) { - HANDLE hEvent; + HANDLE hEvent = NULL; WLog_Print(g_Log, g_LogLevel, "SCardAccessStartedEvent {"); @@ -622,7 +622,7 @@ static void WINAPI Inspect_SCardReleaseStartedEvent(void) static LONG WINAPI Inspect_SCardLocateCardsA(SCARDCONTEXT hContext, LPCSTR mszCards, LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardLocateCardsA { hContext: %p", (void*)hContext); @@ -638,7 +638,7 @@ static LONG WINAPI Inspect_SCardLocateCardsA(SCARDCONTEXT hContext, LPCSTR mszCa static LONG WINAPI Inspect_SCardLocateCardsW(SCARDCONTEXT hContext, LPCWSTR mszCards, LPSCARD_READERSTATEW rgReaderStates, DWORD cReaders) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardLocateCardsW { hContext: %p", (void*)hContext); @@ -655,7 +655,7 @@ static LONG WINAPI Inspect_SCardLocateCardsByATRA(SCARDCONTEXT hContext, LPSCARD DWORD cAtrs, LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardLocateCardsByATRA { hContext: %p", (void*)hContext); @@ -672,7 +672,7 @@ static LONG WINAPI Inspect_SCardLocateCardsByATRW(SCARDCONTEXT hContext, LPSCARD DWORD cAtrs, LPSCARD_READERSTATEW rgReaderStates, DWORD cReaders) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardLocateCardsByATRW { hContext: %p", (void*)hContext); @@ -689,7 +689,7 @@ static LONG WINAPI Inspect_SCardGetStatusChangeA(SCARDCONTEXT hContext, DWORD dw LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetStatusChangeA { hContext: %p", (void*)hContext); @@ -706,7 +706,7 @@ static LONG WINAPI Inspect_SCardGetStatusChangeW(SCARDCONTEXT hContext, DWORD dw LPSCARD_READERSTATEW rgReaderStates, DWORD cReaders) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetStatusChangeW { hContext: %p", (void*)hContext); @@ -721,7 +721,7 @@ static LONG WINAPI Inspect_SCardGetStatusChangeW(SCARDCONTEXT hContext, DWORD dw static LONG WINAPI Inspect_SCardCancel(SCARDCONTEXT hContext) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardCancel { hContext: %p", (void*)hContext); @@ -737,7 +737,7 @@ static LONG WINAPI Inspect_SCardConnectA(SCARDCONTEXT hContext, LPCSTR szReader, DWORD dwPreferredProtocols, LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardConnectA { hContext: %p", (void*)hContext); @@ -754,7 +754,7 @@ static LONG WINAPI Inspect_SCardConnectW(SCARDCONTEXT hContext, LPCWSTR szReader DWORD dwPreferredProtocols, LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardConnectW { hContext: %p", (void*)hContext); @@ -771,7 +771,7 @@ static LONG WINAPI Inspect_SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode, DWORD dwPreferredProtocols, DWORD dwInitialization, LPDWORD pdwActiveProtocol) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardReconnect { hCard: %p", (void*)hCard); @@ -786,7 +786,7 @@ static LONG WINAPI Inspect_SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode, static LONG WINAPI Inspect_SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardDisconnect { hCard: %p", (void*)hCard); @@ -800,7 +800,7 @@ static LONG WINAPI Inspect_SCardDisconnect(SCARDHANDLE hCard, DWORD dwDispositio static LONG WINAPI Inspect_SCardBeginTransaction(SCARDHANDLE hCard) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardBeginTransaction { hCard: %p", (void*)hCard); @@ -814,7 +814,7 @@ static LONG WINAPI Inspect_SCardBeginTransaction(SCARDHANDLE hCard) static LONG WINAPI Inspect_SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDisposition) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardEndTransaction { hCard: %p", (void*)hCard); @@ -828,7 +828,7 @@ static LONG WINAPI Inspect_SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDispos static LONG WINAPI Inspect_SCardCancelTransaction(SCARDHANDLE hCard) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardCancelTransaction { hCard: %p", (void*)hCard); @@ -843,7 +843,7 @@ static LONG WINAPI Inspect_SCardCancelTransaction(SCARDHANDLE hCard) static LONG WINAPI Inspect_SCardState(SCARDHANDLE hCard, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardState { hCard: %p", (void*)hCard); @@ -859,7 +859,7 @@ static LONG WINAPI Inspect_SCardStatusA(SCARDHANDLE hCard, LPSTR mszReaderNames, LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardStatusA { hCard: %p", (void*)hCard); @@ -876,7 +876,7 @@ static LONG WINAPI Inspect_SCardStatusW(SCARDHANDLE hCard, LPWSTR mszReaderNames LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardStatusW { hCard: %p", (void*)hCard); @@ -894,7 +894,7 @@ static LONG WINAPI Inspect_SCardTransmit(SCARDHANDLE hCard, LPCSCARD_IO_REQUEST LPSCARD_IO_REQUEST pioRecvPci, LPBYTE pbRecvBuffer, LPDWORD pcbRecvLength) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardTransmit { hCard: %p", (void*)hCard); @@ -909,7 +909,7 @@ static LONG WINAPI Inspect_SCardTransmit(SCARDHANDLE hCard, LPCSCARD_IO_REQUEST static LONG WINAPI Inspect_SCardGetTransmitCount(SCARDHANDLE hCard, LPDWORD pcTransmitCount) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetTransmitCount { hCard: %p", (void*)hCard); @@ -925,7 +925,7 @@ static LONG WINAPI Inspect_SCardControl(SCARDHANDLE hCard, DWORD dwControlCode, DWORD cbInBufferSize, LPVOID lpOutBuffer, DWORD cbOutBufferSize, LPDWORD lpBytesReturned) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardControl { hCard: %p", (void*)hCard); @@ -941,7 +941,7 @@ static LONG WINAPI Inspect_SCardControl(SCARDHANDLE hCard, DWORD dwControlCode, static LONG WINAPI Inspect_SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPBYTE pbAttr, LPDWORD pcbAttrLen) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetAttrib { hCard: %p", (void*)hCard); @@ -956,7 +956,7 @@ static LONG WINAPI Inspect_SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPB static LONG WINAPI Inspect_SCardSetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPCBYTE pbAttr, DWORD cbAttrLen) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardSetAttrib { hCard: %p", (void*)hCard); @@ -970,7 +970,7 @@ static LONG WINAPI Inspect_SCardSetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPC static LONG WINAPI Inspect_SCardUIDlgSelectCardA(LPOPENCARDNAMEA_EX pDlgStruc) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardUIDlgSelectCardA {"); @@ -984,7 +984,7 @@ static LONG WINAPI Inspect_SCardUIDlgSelectCardA(LPOPENCARDNAMEA_EX pDlgStruc) static LONG WINAPI Inspect_SCardUIDlgSelectCardW(LPOPENCARDNAMEW_EX pDlgStruc) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardUIDlgSelectCardW {"); @@ -998,7 +998,7 @@ static LONG WINAPI Inspect_SCardUIDlgSelectCardW(LPOPENCARDNAMEW_EX pDlgStruc) static LONG WINAPI Inspect_GetOpenCardNameA(LPOPENCARDNAMEA pDlgStruc) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "GetOpenCardNameA {"); @@ -1012,7 +1012,7 @@ static LONG WINAPI Inspect_GetOpenCardNameA(LPOPENCARDNAMEA pDlgStruc) static LONG WINAPI Inspect_GetOpenCardNameW(LPOPENCARDNAMEW pDlgStruc) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "GetOpenCardNameW {"); @@ -1026,7 +1026,7 @@ static LONG WINAPI Inspect_GetOpenCardNameW(LPOPENCARDNAMEW pDlgStruc) static LONG WINAPI Inspect_SCardDlgExtendedError(void) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardDlgExtendedError {"); @@ -1042,7 +1042,7 @@ static LONG WINAPI Inspect_SCardReadCacheA(SCARDCONTEXT hContext, UUID* CardIden DWORD FreshnessCounter, LPSTR LookupName, PBYTE Data, DWORD* DataLen) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardReadCacheA { hContext: %p", (void*)hContext); @@ -1059,7 +1059,7 @@ static LONG WINAPI Inspect_SCardReadCacheW(SCARDCONTEXT hContext, UUID* CardIden DWORD FreshnessCounter, LPWSTR LookupName, PBYTE Data, DWORD* DataLen) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardReadCacheW { hContext: %p", (void*)hContext); @@ -1076,7 +1076,7 @@ static LONG WINAPI Inspect_SCardWriteCacheA(SCARDCONTEXT hContext, UUID* CardIde DWORD FreshnessCounter, LPSTR LookupName, PBYTE Data, DWORD DataLen) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardWriteCacheA { hContext: %p", (void*)hContext); @@ -1093,7 +1093,7 @@ static LONG WINAPI Inspect_SCardWriteCacheW(SCARDCONTEXT hContext, UUID* CardIde DWORD FreshnessCounter, LPWSTR LookupName, PBYTE Data, DWORD DataLen) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardWriteCacheW { hContext: %p", (void*)hContext); @@ -1109,7 +1109,7 @@ static LONG WINAPI Inspect_SCardWriteCacheW(SCARDCONTEXT hContext, UUID* CardIde static LONG WINAPI Inspect_SCardGetReaderIconA(SCARDCONTEXT hContext, LPCSTR szReaderName, LPBYTE pbIcon, LPDWORD pcbIcon) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetReaderIconA { hContext: %p", (void*)hContext); @@ -1124,7 +1124,7 @@ static LONG WINAPI Inspect_SCardGetReaderIconA(SCARDCONTEXT hContext, LPCSTR szR static LONG WINAPI Inspect_SCardGetReaderIconW(SCARDCONTEXT hContext, LPCWSTR szReaderName, LPBYTE pbIcon, LPDWORD pcbIcon) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetReaderIconW { hContext: %p", (void*)hContext); @@ -1139,7 +1139,7 @@ static LONG WINAPI Inspect_SCardGetReaderIconW(SCARDCONTEXT hContext, LPCWSTR sz static LONG WINAPI Inspect_SCardGetDeviceTypeIdA(SCARDCONTEXT hContext, LPCSTR szReaderName, LPDWORD pdwDeviceTypeId) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetDeviceTypeIdA { hContext: %p", (void*)hContext); @@ -1154,7 +1154,7 @@ static LONG WINAPI Inspect_SCardGetDeviceTypeIdA(SCARDCONTEXT hContext, LPCSTR s static LONG WINAPI Inspect_SCardGetDeviceTypeIdW(SCARDCONTEXT hContext, LPCWSTR szReaderName, LPDWORD pdwDeviceTypeId) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetDeviceTypeIdW { hContext: %p", (void*)hContext); @@ -1171,7 +1171,7 @@ static LONG WINAPI Inspect_SCardGetReaderDeviceInstanceIdA(SCARDCONTEXT hContext LPSTR szDeviceInstanceId, LPDWORD pcchDeviceInstanceId) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetReaderDeviceInstanceIdA { hContext: %p", (void*)hContext); @@ -1190,7 +1190,7 @@ static LONG WINAPI Inspect_SCardGetReaderDeviceInstanceIdW(SCARDCONTEXT hContext LPWSTR szDeviceInstanceId, LPDWORD pcchDeviceInstanceId) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardGetReaderDeviceInstanceIdW { hContext: %p", (void*)hContext); @@ -1209,7 +1209,7 @@ static LONG WINAPI Inspect_SCardListReadersWithDeviceInstanceIdA(SCARDCONTEXT hC LPSTR mszReaders, LPDWORD pcchReaders) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardListReadersWithDeviceInstanceIdA { hContext: %p", (void*)hContext); @@ -1229,7 +1229,7 @@ static LONG WINAPI Inspect_SCardListReadersWithDeviceInstanceIdW(SCARDCONTEXT hC LPWSTR mszReaders, LPDWORD pcchReaders) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardListReadersWithDeviceInstanceIdW { hContext: %p", (void*)hContext); @@ -1246,7 +1246,7 @@ static LONG WINAPI Inspect_SCardListReadersWithDeviceInstanceIdW(SCARDCONTEXT hC static LONG WINAPI Inspect_SCardAudit(SCARDCONTEXT hContext, DWORD dwEvent) { - LONG status; + LONG status = 0; WLog_Print(g_Log, g_LogLevel, "SCardAudit { hContext: %p", (void*)hContext); diff --git a/winpr/libwinpr/smartcard/smartcard_pcsc.c b/winpr/libwinpr/smartcard/smartcard_pcsc.c index 04f7c08d9..78eac282b 100644 --- a/winpr/libwinpr/smartcard/smartcard_pcsc.c +++ b/winpr/libwinpr/smartcard/smartcard_pcsc.c @@ -366,7 +366,7 @@ static DWORD PCSC_ConvertProtocolsFromWinSCard(DWORD dwProtocols) static PCSC_SCARDCONTEXT* PCSC_GetCardContextData(SCARDCONTEXT hContext) { - PCSC_SCARDCONTEXT* pContext; + PCSC_SCARDCONTEXT* pContext = NULL; if (!g_CardContexts) return NULL; @@ -389,7 +389,7 @@ static void pcsc_cache_item_free(void* ptr) static PCSC_SCARDCONTEXT* PCSC_EstablishCardContext(SCARDCONTEXT hContext) { - PCSC_SCARDCONTEXT* pContext; + PCSC_SCARDCONTEXT* pContext = NULL; pContext = (PCSC_SCARDCONTEXT*)calloc(1, sizeof(PCSC_SCARDCONTEXT)); if (!pContext) @@ -432,7 +432,7 @@ error_spinlock: static void PCSC_ReleaseCardContext(SCARDCONTEXT hContext) { - PCSC_SCARDCONTEXT* pContext; + PCSC_SCARDCONTEXT* pContext = NULL; pContext = PCSC_GetCardContextData(hContext); if (!pContext) @@ -453,7 +453,7 @@ static void PCSC_ReleaseCardContext(SCARDCONTEXT hContext) static BOOL PCSC_LockCardContext(SCARDCONTEXT hContext) { - PCSC_SCARDCONTEXT* pContext; + PCSC_SCARDCONTEXT* pContext = NULL; pContext = PCSC_GetCardContextData(hContext); if (!pContext) @@ -468,7 +468,7 @@ static BOOL PCSC_LockCardContext(SCARDCONTEXT hContext) static BOOL PCSC_UnlockCardContext(SCARDCONTEXT hContext) { - PCSC_SCARDCONTEXT* pContext; + PCSC_SCARDCONTEXT* pContext = NULL; pContext = PCSC_GetCardContextData(hContext); if (!pContext) @@ -483,7 +483,7 @@ static BOOL PCSC_UnlockCardContext(SCARDCONTEXT hContext) static PCSC_SCARDHANDLE* PCSC_GetCardHandleData(SCARDHANDLE hCard) { - PCSC_SCARDHANDLE* pCard; + PCSC_SCARDHANDLE* pCard = NULL; if (!g_CardHandles) return NULL; @@ -498,7 +498,7 @@ static PCSC_SCARDHANDLE* PCSC_GetCardHandleData(SCARDHANDLE hCard) static SCARDCONTEXT PCSC_GetCardContextFromHandle(SCARDHANDLE hCard) { - PCSC_SCARDHANDLE* pCard; + PCSC_SCARDHANDLE* pCard = NULL; pCard = PCSC_GetCardHandleData(hCard); if (!pCard) @@ -611,8 +611,8 @@ static BOOL PCSC_ReleaseCardAccess(SCARDCONTEXT hContext, SCARDHANDLE hCard) static PCSC_SCARDHANDLE* PCSC_ConnectCardHandle(SCARDCONTEXT hSharedContext, SCARDHANDLE hCard) { - PCSC_SCARDHANDLE* pCard; - PCSC_SCARDCONTEXT* pContext; + PCSC_SCARDHANDLE* pCard = NULL; + PCSC_SCARDCONTEXT* pContext = NULL; pContext = PCSC_GetCardContextData(hSharedContext); if (!pContext) @@ -648,8 +648,8 @@ error: static void PCSC_DisconnectCardHandle(SCARDHANDLE hCard) { - PCSC_SCARDHANDLE* pCard; - PCSC_SCARDCONTEXT* pContext; + PCSC_SCARDHANDLE* pCard = NULL; + PCSC_SCARDCONTEXT* pContext = NULL; pCard = PCSC_GetCardHandleData(hCard); if (!pCard) @@ -717,7 +717,7 @@ static LONG WINAPI PCSC_SCardEstablishContext_Internal(DWORD dwScope, LPCVOID pv static LONG WINAPI PCSC_SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, LPCVOID pvReserved2, LPSCARDCONTEXT phContext) { - LONG status; + LONG status = 0; status = PCSC_SCardEstablishContext_Internal(dwScope, pvReserved1, pvReserved2, phContext); @@ -1048,7 +1048,7 @@ static PcscKnownAtr knownAtrs[] = { static const char* findCardByAtr(LPCBYTE pbAtr) { - size_t i; + size_t i = 0; for (i = 0; i < ARRAY_LENGTH(knownAtrs); i++) { @@ -1066,7 +1066,7 @@ static LONG WINAPI PCSC_SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, const char* cardName = NULL; DWORD outputLen = 1; CHAR* output = NULL; - BOOL autoAllocate; + BOOL autoAllocate = 0; if (!pbAtr || rgquidInterfaces || cguidInterfaceCount) return SCARD_E_UNSUPPORTED_FEATURE; @@ -1119,7 +1119,7 @@ static LONG WINAPI PCSC_SCardListCardsW(SCARDCONTEXT hContext, LPCBYTE pbAtr, const char* cardName = NULL; DWORD outputLen = 1; WCHAR* output = NULL; - BOOL autoAllocate; + BOOL autoAllocate = 0; if (!pbAtr || rgquidInterfaces || cguidInterfaceCount) return SCARD_E_UNSUPPORTED_FEATURE; @@ -1524,11 +1524,11 @@ static LONG WINAPI PCSC_SCardGetStatusChange_Internal(SCARDCONTEXT hContext, DWO LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders) { - PCSC_DWORD i; - PCSC_DWORD j; - INT64* map; - PCSC_DWORD cMappedReaders; - PCSC_SCARD_READERSTATE* states; + PCSC_DWORD i = 0; + PCSC_DWORD j = 0; + INT64* map = NULL; + PCSC_DWORD cMappedReaders = 0; + PCSC_SCARD_READERSTATE* states = NULL; PCSC_LONG status = SCARD_S_SUCCESS; PCSC_DWORD pcsc_dwTimeout = (PCSC_DWORD)dwTimeout; PCSC_DWORD pcsc_cReaders = (PCSC_DWORD)cReaders; @@ -1638,8 +1638,8 @@ static LONG WINAPI PCSC_SCardGetStatusChangeA(SCARDCONTEXT hContext, DWORD dwTim static LONG WINAPI PCSC_SCardGetStatusChangeW(SCARDCONTEXT hContext, DWORD dwTimeout, LPSCARD_READERSTATEW rgReaderStates, DWORD cReaders) { - DWORD index; - LPSCARD_READERSTATEA states; + DWORD index = 0; + LPSCARD_READERSTATEA states = NULL; LONG status = SCARD_S_SUCCESS; if (!g_PCSC.pfnSCardGetStatusChange) @@ -1704,8 +1704,8 @@ static LONG WINAPI PCSC_SCardConnect_Internal(SCARDCONTEXT hContext, LPCSTR szRe DWORD dwShareMode, DWORD dwPreferredProtocols, LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol) { - BOOL shared; - const char* szReaderPCSC; + BOOL shared = 0; + const char* szReaderPCSC = NULL; PCSC_LONG status = SCARD_S_SUCCESS; PCSC_SCARDHANDLE* pCard = NULL; PCSC_DWORD pcsc_dwShareMode = (PCSC_DWORD)dwShareMode; @@ -1795,7 +1795,7 @@ static LONG WINAPI PCSC_SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode, DWORD dwPreferredProtocols, DWORD dwInitialization, LPDWORD pdwActiveProtocol) { - BOOL shared; + BOOL shared = 0; PCSC_LONG status = SCARD_S_SUCCESS; PCSC_DWORD pcsc_dwShareMode = (PCSC_DWORD)dwShareMode; PCSC_DWORD pcsc_dwPreferredProtocols = 0; @@ -1909,8 +1909,8 @@ static LONG WINAPI PCSC_SCardStatus_Internal(SCARDHANDLE hCard, LPSTR mszReaderN BOOL unicode) { PCSC_SCARDHANDLE* pCard = NULL; - SCARDCONTEXT hContext; - PCSC_LONG status; + SCARDCONTEXT hContext = 0; + PCSC_LONG status = 0; PCSC_DWORD pcsc_cchReaderLen = 0; PCSC_DWORD pcsc_cbAtrLen = 0; PCSC_DWORD pcsc_dwState = 0; @@ -2067,7 +2067,7 @@ out_fail: static LONG WINAPI PCSC_SCardState(SCARDHANDLE hCard, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) { - DWORD cchReaderLen; + DWORD cchReaderLen = 0; SCARDCONTEXT hContext = 0; LPSTR mszReaderNames = NULL; PCSC_LONG status = SCARD_S_SUCCESS; @@ -2313,8 +2313,8 @@ static LONG WINAPI PCSC_SCardControl(SCARDHANDLE hCard, DWORD dwControlCode, LPC if (getFeatureRequest) { - UINT32 index; - UINT32 count; + UINT32 index = 0; + UINT32 count = 0; PCSC_TLV_STRUCTURE* tlv = (PCSC_TLV_STRUCTURE*)lpOutBuffer; if ((*lpBytesReturned % sizeof(PCSC_TLV_STRUCTURE)) != 0) @@ -2407,7 +2407,7 @@ static LONG WINAPI PCSC_SCardGetAttrib_FriendlyName(SCARDHANDLE hCard, DWORD dwA char* pbAttrA = NULL; DWORD cbAttrLen = 0; WCHAR* pbAttrW = NULL; - SCARDCONTEXT hContext; + SCARDCONTEXT hContext = 0; LONG status = SCARD_S_SUCCESS; hContext = PCSC_GetCardContextFromHandle(hCard); @@ -2509,8 +2509,8 @@ static LONG WINAPI PCSC_SCardGetAttrib_FriendlyName(SCARDHANDLE hCard, DWORD dwA static LONG WINAPI PCSC_SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPBYTE pbAttr, LPDWORD pcbAttrLen) { - DWORD cbAttrLen; - SCARDCONTEXT hContext; + DWORD cbAttrLen = 0; + SCARDCONTEXT hContext = 0; BOOL pcbAttrLenAlloc = FALSE; LONG status = SCARD_S_SUCCESS; @@ -2557,7 +2557,7 @@ static LONG WINAPI PCSC_SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPBYTE { if (pbAttr) { - const char* vendorName; + const char* vendorName = NULL; /** * pcsc-lite adds a null terminator to the vendor name, @@ -2756,7 +2756,7 @@ static char* card_id_and_name_a(const UUID* CardIdentifier, LPCSTR LookupName) static char* card_id_and_name_w(const UUID* CardIdentifier, LPCWSTR LookupName) { - char* res; + char* res = NULL; char* tmp = ConvertWCharToUtf8Alloc(LookupName, NULL); if (!tmp) return NULL; @@ -2769,7 +2769,7 @@ static LONG WINAPI PCSC_SCardReadCacheA(SCARDCONTEXT hContext, UUID* CardIdentif DWORD FreshnessCounter, LPSTR LookupName, PBYTE Data, DWORD* DataLen) { - PCSC_CACHE_ITEM* data; + PCSC_CACHE_ITEM* data = NULL; PCSC_SCARDCONTEXT* ctx = PCSC_GetCardContextData(hContext); char* id = card_id_and_name_a(CardIdentifier, LookupName); @@ -2812,7 +2812,7 @@ static LONG WINAPI PCSC_SCardReadCacheW(SCARDCONTEXT hContext, UUID* CardIdentif DWORD FreshnessCounter, LPWSTR LookupName, PBYTE Data, DWORD* DataLen) { - PCSC_CACHE_ITEM* data; + PCSC_CACHE_ITEM* data = NULL; PCSC_SCARDCONTEXT* ctx = PCSC_GetCardContextData(hContext); char* id = card_id_and_name_w(CardIdentifier, LookupName); @@ -2856,9 +2856,9 @@ static LONG WINAPI PCSC_SCardWriteCacheA(SCARDCONTEXT hContext, UUID* CardIdenti DWORD FreshnessCounter, LPSTR LookupName, PBYTE Data, DWORD DataLen) { - PCSC_CACHE_ITEM* data; + PCSC_CACHE_ITEM* data = NULL; PCSC_SCARDCONTEXT* ctx = PCSC_GetCardContextData(hContext); - char* id; + char* id = NULL; if (!ctx) return SCARD_E_FILE_NOT_FOUND; @@ -2902,9 +2902,9 @@ static LONG WINAPI PCSC_SCardWriteCacheW(SCARDCONTEXT hContext, UUID* CardIdenti DWORD FreshnessCounter, LPWSTR LookupName, PBYTE Data, DWORD DataLen) { - PCSC_CACHE_ITEM* data; + PCSC_CACHE_ITEM* data = NULL; PCSC_SCARDCONTEXT* ctx = PCSC_GetCardContextData(hContext); - char* id; + char* id = NULL; if (!ctx) return SCARD_E_FILE_NOT_FOUND; diff --git a/winpr/libwinpr/smartcard/test/TestSmartCardListReaders.c b/winpr/libwinpr/smartcard/test/TestSmartCardListReaders.c index ee9dacb1e..637200b4f 100644 --- a/winpr/libwinpr/smartcard/test/TestSmartCardListReaders.c +++ b/winpr/libwinpr/smartcard/test/TestSmartCardListReaders.c @@ -4,8 +4,8 @@ int TestSmartCardListReaders(int argc, char* argv[]) { - LONG lStatus; - LPSTR pReader; + LONG lStatus = 0; + LPSTR pReader = NULL; SCARDCONTEXT hSC = 0; LPSTR mszReaders = NULL; DWORD cchReaders = SCARD_AUTOALLOCATE; diff --git a/winpr/libwinpr/sspi/CredSSP/credssp.c b/winpr/libwinpr/sspi/CredSSP/credssp.c index 1d5036407..558155524 100644 --- a/winpr/libwinpr/sspi/CredSSP/credssp.c +++ b/winpr/libwinpr/sspi/CredSSP/credssp.c @@ -45,8 +45,8 @@ static SECURITY_STATUS SEC_ENTRY credssp_InitializeSecurityContextA( ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsExpiry) { - CREDSSP_CONTEXT* context; - SSPI_CREDENTIALS* credentials; + CREDSSP_CONTEXT* context = NULL; + SSPI_CREDENTIALS* credentials = NULL; /* behave like windows SSPIs that don't want empty context */ if (phContext && !phContext->dwLower && !phContext->dwUpper) @@ -85,7 +85,7 @@ static SECURITY_STATUS SEC_ENTRY credssp_InitializeSecurityContextA( CREDSSP_CONTEXT* credssp_ContextNew(void) { - CREDSSP_CONTEXT* context; + CREDSSP_CONTEXT* context = NULL; context = (CREDSSP_CONTEXT*)calloc(1, sizeof(CREDSSP_CONTEXT)); if (!context) @@ -126,8 +126,8 @@ static SECURITY_STATUS SEC_ENTRY credssp_AcquireCredentialsHandleA( void* pAuthData, SEC_GET_KEY_FN pGetKeyFn, void* pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - SSPI_CREDENTIALS* credentials; - SEC_WINNT_AUTH_IDENTITY* identity; + SSPI_CREDENTIALS* credentials = NULL; + SEC_WINNT_AUTH_IDENTITY* identity = NULL; if (fCredentialUse == SECPKG_CRED_OUTBOUND) { @@ -183,7 +183,7 @@ static SECURITY_STATUS SEC_ENTRY credssp_QueryCredentialsAttributesA(PCredHandle static SECURITY_STATUS SEC_ENTRY credssp_FreeCredentialsHandle(PCredHandle phCredential) { - SSPI_CREDENTIALS* credentials; + SSPI_CREDENTIALS* credentials = NULL; if (!phCredential) return SEC_E_INVALID_HANDLE; diff --git a/winpr/libwinpr/sspi/Kerberos/kerberos.c b/winpr/libwinpr/sspi/Kerberos/kerberos.c index 8719b23e5..b0c561ec4 100644 --- a/winpr/libwinpr/sspi/Kerberos/kerberos.c +++ b/winpr/libwinpr/sspi/Kerberos/kerberos.c @@ -166,7 +166,7 @@ static void kerberos_ContextFree(KRB_CONTEXT* ctx, BOOL allocated) static KRB_CONTEXT* kerberos_ContextNew(void) { - KRB_CONTEXT* context; + KRB_CONTEXT* context = NULL; context = (KRB_CONTEXT*)calloc(1, sizeof(KRB_CONTEXT)); if (!context) @@ -395,7 +395,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleW( void* pAuthData, SEC_GET_KEY_FN pGetKeyFn, void* pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; char* principal = NULL; char* package = NULL; @@ -427,8 +427,8 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleW( static SECURITY_STATUS SEC_ENTRY kerberos_FreeCredentialsHandle(PCredHandle phCredential) { #ifdef WITH_KRB5 - KRB_CREDENTIALS* credentials; - krb5_context ctx; + KRB_CREDENTIALS* credentials = NULL; + krb5_context ctx = NULL; credentials = sspi_SecureHandleGetLowerPointer(phCredential); if (!credentials) @@ -489,10 +489,10 @@ static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesA(PCredHandl static BOOL kerberos_mk_tgt_token(SecBuffer* buf, int msg_type, char* sname, char* host, const krb5_data* ticket) { - WinPrAsn1Encoder* enc; + WinPrAsn1Encoder* enc = NULL; WinPrAsn1_MemoryChunk data; wStream s; - size_t len; + size_t len = 0; sspi_gss_data token; BOOL ret = FALSE; @@ -576,10 +576,10 @@ static BOOL kerberos_rd_tgt_token(const sspi_gss_data* token, char** target, krb { WinPrAsn1Decoder dec; WinPrAsn1Decoder dec2; - BOOL error; - WinPrAsn1_tagId tag; - WinPrAsn1_INTEGER val; - size_t len; + BOOL error = 0; + WinPrAsn1_tagId tag = 0; + WinPrAsn1_INTEGER val = 0; + size_t len = 0; wStream s; char* buf = NULL; char* str = NULL; @@ -732,8 +732,8 @@ static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextA( PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG* pfContextAttr, PTimeStamp ptsExpiry) { #ifdef WITH_KRB5 - KRB_CREDENTIALS* credentials; - KRB_CONTEXT* context; + KRB_CREDENTIALS* credentials = NULL; + KRB_CONTEXT* context = NULL; KRB_CONTEXT new_context = { 0 }; PSecBuffer input_buffer = NULL; PSecBuffer output_buffer = NULL; @@ -1038,7 +1038,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextW( ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG* pfContextAttr, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; char* target_name = NULL; if (pszTargetName) @@ -1064,22 +1064,22 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcceptSecurityContext( PTimeStamp ptsExpity) { #ifdef WITH_KRB5 - KRB_CREDENTIALS* credentials; - KRB_CONTEXT* context; + KRB_CREDENTIALS* credentials = NULL; + KRB_CONTEXT* context = NULL; KRB_CONTEXT new_context = { 0 }; PSecBuffer input_buffer = NULL; PSecBuffer output_buffer = NULL; WinPrAsn1_OID oid = { 0 }; - uint16_t tok_id; + uint16_t tok_id = 0; krb5_data input_token = { 0 }; krb5_data output_token = { 0 }; SECURITY_STATUS status = SEC_E_INTERNAL_ERROR; krb5_flags ap_flags = 0; - krb5glue_authenticator authenticator; + krb5glue_authenticator authenticator = NULL; char* target = NULL; char* sname = NULL; char* realm = NULL; - krb5_kt_cursor cur; + krb5_kt_cursor cur = { 0 }; krb5_keytab_entry entry = { 0 }; krb5_principal principal = NULL; krb5_creds creds = { 0 }; @@ -1332,10 +1332,10 @@ static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesA(PCtxtHandle ph if (ulAttribute == SECPKG_ATTR_SIZES) { - UINT header; - UINT pad; - UINT trailer; - krb5glue_key key; + UINT header = 0; + UINT pad = 0; + UINT trailer = 0; + krb5glue_key key = NULL; KRB_CONTEXT* context = get_context(phContext); SecPkgContext_Sizes* ContextSizes = (SecPkgContext_Sizes*)pBuffer; @@ -1417,7 +1417,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_SetCredentialsAttributesX(PCredHandle BOOL unicode) { #ifdef WITH_KRB5 - KRB_CREDENTIALS* credentials; + KRB_CREDENTIALS* credentials = NULL; if (!phCredential) return SEC_E_INVALID_HANDLE; @@ -1487,12 +1487,12 @@ static SECURITY_STATUS SEC_ENTRY kerberos_EncryptMessage(PCtxtHandle phContext, { #ifdef WITH_KRB5 KRB_CONTEXT* context = get_context(phContext); - PSecBuffer sig_buffer; - PSecBuffer data_buffer; - BYTE* header; + PSecBuffer sig_buffer = NULL; + PSecBuffer data_buffer = NULL; + BYTE* header = NULL; BYTE flags = 0; - krb5glue_key key; - krb5_keyusage usage; + krb5glue_key key = NULL; + krb5_keyusage usage = 0; krb5_crypto_iov encrypt_iov[] = { { KRB5_CRYPTO_TYPE_HEADER, { 0 } }, { KRB5_CRYPTO_TYPE_DATA, { 0 } }, { KRB5_CRYPTO_TYPE_DATA, { 0 } }, @@ -1574,16 +1574,16 @@ static SECURITY_STATUS SEC_ENTRY kerberos_DecryptMessage(PCtxtHandle phContext, { #ifdef WITH_KRB5 KRB_CONTEXT* context = get_context(phContext); - PSecBuffer sig_buffer; - PSecBuffer data_buffer; - krb5glue_key key; - krb5_keyusage usage; - char* header; - uint16_t tok_id; - BYTE flags; - uint16_t ec; - uint16_t rrc; - uint64_t seq_no; + PSecBuffer sig_buffer = NULL; + PSecBuffer data_buffer = NULL; + krb5glue_key key = NULL; + krb5_keyusage usage = 0; + char* header = NULL; + uint16_t tok_id = 0; + BYTE flags = 0; + uint16_t ec = 0; + uint16_t rrc = 0; + uint64_t seq_no = 0; krb5_crypto_iov iov[] = { { KRB5_CRYPTO_TYPE_HEADER, { 0 } }, { KRB5_CRYPTO_TYPE_DATA, { 0 } }, { KRB5_CRYPTO_TYPE_DATA, { 0 } }, @@ -1674,11 +1674,11 @@ static SECURITY_STATUS SEC_ENTRY kerberos_MakeSignature(PCtxtHandle phContext, U { #ifdef WITH_KRB5 KRB_CONTEXT* context = get_context(phContext); - PSecBuffer sig_buffer; - PSecBuffer data_buffer; - krb5glue_key key; - krb5_keyusage usage; - char* header; + PSecBuffer sig_buffer = NULL; + PSecBuffer data_buffer = NULL; + krb5glue_key key = NULL; + krb5_keyusage usage = 0; + char* header = NULL; BYTE flags = 0; krb5_crypto_iov iov[] = { { KRB5_CRYPTO_TYPE_DATA, { 0 } }, { KRB5_CRYPTO_TYPE_DATA, { 0 } }, @@ -1743,15 +1743,15 @@ static SECURITY_STATUS SEC_ENTRY kerberos_VerifySignature(PCtxtHandle phContext, ULONG MessageSeqNo, ULONG* pfQOP) { #ifdef WITH_KRB5 - PSecBuffer sig_buffer; - PSecBuffer data_buffer; - krb5glue_key key; - krb5_keyusage usage; - char* header; - BYTE flags; - uint16_t tok_id; - uint64_t seq_no; - krb5_boolean is_valid; + PSecBuffer sig_buffer = NULL; + PSecBuffer data_buffer = NULL; + krb5glue_key key = NULL; + krb5_keyusage usage = 0; + char* header = NULL; + BYTE flags = 0; + uint16_t tok_id = 0; + uint64_t seq_no = 0; + krb5_boolean is_valid = 0; krb5_crypto_iov iov[] = { { KRB5_CRYPTO_TYPE_DATA, { 0 } }, { KRB5_CRYPTO_TYPE_DATA, { 0 } }, { KRB5_CRYPTO_TYPE_CHECKSUM, { 0 } } }; diff --git a/winpr/libwinpr/sspi/Kerberos/krb5glue_mit.c b/winpr/libwinpr/sspi/Kerberos/krb5glue_mit.c index fabd1a29f..2638b221d 100644 --- a/winpr/libwinpr/sspi/Kerberos/krb5glue_mit.c +++ b/winpr/libwinpr/sspi/Kerberos/krb5glue_mit.c @@ -34,8 +34,8 @@ static char* create_temporary_file(void) { BYTE buffer[32]; - char* hex; - char* path; + char* hex = NULL; + char* path = NULL; winpr_RAND(buffer, sizeof(buffer)); hex = winpr_BinToHexString(buffer, sizeof(buffer), FALSE); diff --git a/winpr/libwinpr/sspi/NTLM/ntlm.c b/winpr/libwinpr/sspi/NTLM/ntlm.c index 50feeebd3..ed86f5c9f 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm.c @@ -109,7 +109,7 @@ static int ntlm_SetContextWorkstation(NTLM_CONTEXT* context, char* Workstation) { char* ws = Workstation; DWORD nSize = 0; - CHAR* computerName; + CHAR* computerName = NULL; WINPR_ASSERT(context); @@ -479,10 +479,10 @@ ntlm_AcceptSecurityContext(PCredHandle phCredential, PCtxtHandle phContext, PSec ULONG fContextReq, ULONG TargetDataRep, PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsTimeStamp) { - SECURITY_STATUS status; - SSPI_CREDENTIALS* credentials; - PSecBuffer input_buffer; - PSecBuffer output_buffer; + SECURITY_STATUS status = 0; + SSPI_CREDENTIALS* credentials = NULL; + PSecBuffer input_buffer = NULL; + PSecBuffer output_buffer = NULL; /* behave like windows SSPIs that don't want empty context */ if (phContext && !phContext->dwLower && !phContext->dwUpper) @@ -579,7 +579,7 @@ ntlm_AcceptSecurityContext(PCredHandle phCredential, PCtxtHandle phContext, PSec if (pOutput) { - ULONG i; + ULONG i = 0; for (i = 0; i < pOutput->cBuffers; i++) { @@ -606,8 +606,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; - SSPI_CREDENTIALS* credentials; + SECURITY_STATUS status = 0; + SSPI_CREDENTIALS* credentials = NULL; PSecBuffer input_buffer = NULL; PSecBuffer output_buffer = NULL; PSecBuffer channel_bindings = NULL; @@ -735,7 +735,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextA( ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; SEC_WCHAR* pszTargetNameW = NULL; if (pszTargetName) @@ -763,8 +763,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle phContex SECURITY_STATUS ntlm_computeProofValue(NTLM_CONTEXT* ntlm, SecBuffer* ntproof) { - BYTE* blob; - SecBuffer* target; + BYTE* blob = NULL; + SecBuffer* target = NULL; WINPR_ASSERT(ntlm); WINPR_ASSERT(ntproof); @@ -789,8 +789,8 @@ SECURITY_STATUS ntlm_computeProofValue(NTLM_CONTEXT* ntlm, SecBuffer* ntproof) SECURITY_STATUS ntlm_computeMicValue(NTLM_CONTEXT* ntlm, SecBuffer* micvalue) { - BYTE* blob; - ULONG msgSize; + BYTE* blob = NULL; + ULONG msgSize = 0; WINPR_ASSERT(ntlm); WINPR_ASSERT(micvalue); @@ -839,7 +839,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phCont } else if (ulAttribute == SECPKG_ATTR_AUTH_IDENTITY) { - SSPI_CREDENTIALS* credentials; + SSPI_CREDENTIALS* credentials = NULL; const SecPkgContext_AuthIdentity empty = { 0 }; SecPkgContext_AuthIdentity* AuthIdentity = (SecPkgContext_AuthIdentity*)pBuffer; @@ -872,7 +872,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phCont } else if (ulAttribute == SECPKG_ATTR_AUTH_NTLM_RANDKEY) { - SecBuffer* randkey; + SecBuffer* randkey = NULL; randkey = (SecBuffer*)pBuffer; if (!sspi_SecBufferAlloc(randkey, 16)) diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c index db65487c2..17768eebb 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c @@ -42,7 +42,7 @@ static BOOL ntlm_av_pair_get_next_offset(const NTLM_AV_PAIR* pAvPair, size_t siz static BOOL ntlm_av_pair_check_data(const NTLM_AV_PAIR* pAvPair, size_t cbAvPair, size_t size) { - size_t offset; + size_t offset = 0; if (!pAvPair || cbAvPair < sizeof(NTLM_AV_PAIR) + size) return FALSE; if (!ntlm_av_pair_get_next_offset(pAvPair, cbAvPair, &offset)) @@ -110,7 +110,7 @@ static BOOL ntlm_av_pair_list_init(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairLis static INLINE BOOL ntlm_av_pair_get_id(const NTLM_AV_PAIR* pAvPair, size_t size, UINT16* pair) { - UINT16 AvId; + UINT16 AvId = 0; if (!pAvPair || !pair) return FALSE; @@ -125,9 +125,9 @@ static INLINE BOOL ntlm_av_pair_get_id(const NTLM_AV_PAIR* pAvPair, size_t size, ULONG ntlm_av_pair_list_length(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList) { - size_t size; - size_t cbAvPair; - NTLM_AV_PAIR* pAvPair; + size_t size = 0; + size_t cbAvPair = 0; + NTLM_AV_PAIR* pAvPair = NULL; pAvPair = ntlm_av_pair_get(pAvPairList, cbAvPairList, MsvAvEOL, &cbAvPair); if (!pAvPair) @@ -140,7 +140,7 @@ ULONG ntlm_av_pair_list_length(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList) static INLINE BOOL ntlm_av_pair_get_len(const NTLM_AV_PAIR* pAvPair, size_t size, size_t* pAvLen) { - UINT16 AvLen; + UINT16 AvLen = 0; if (!pAvPair) return FALSE; @@ -156,7 +156,7 @@ static INLINE BOOL ntlm_av_pair_get_len(const NTLM_AV_PAIR* pAvPair, size_t size #ifdef WITH_DEBUG_NTLM void ntlm_print_av_pair_list(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList) { - UINT16 pair; + UINT16 pair = 0; size_t cbAvPair = cbAvPairList; NTLM_AV_PAIR* pAvPair = pAvPairList; @@ -192,7 +192,7 @@ PBYTE ntlm_av_pair_get_value_pointer(NTLM_AV_PAIR* pAvPair) static BOOL ntlm_av_pair_get_next_offset(const NTLM_AV_PAIR* pAvPair, size_t size, size_t* pOffset) { - size_t avLen; + size_t avLen = 0; if (!pOffset) return FALSE; @@ -209,7 +209,7 @@ static BOOL ntlm_av_pair_check(const NTLM_AV_PAIR* pAvPair, size_t cbAvPair) static NTLM_AV_PAIR* ntlm_av_pair_next(NTLM_AV_PAIR* pAvPair, size_t* pcbAvPair) { - size_t offset; + size_t offset = 0; if (!pcbAvPair) return NULL; @@ -226,7 +226,7 @@ static NTLM_AV_PAIR* ntlm_av_pair_next(NTLM_AV_PAIR* pAvPair, size_t* pcbAvPair) NTLM_AV_PAIR* ntlm_av_pair_get(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList, NTLM_AV_ID AvId, size_t* pcbAvPairListRemaining) { - UINT16 id; + UINT16 id = 0; size_t cbAvPair = cbAvPairList; NTLM_AV_PAIR* pAvPair = pAvPairList; @@ -257,8 +257,8 @@ NTLM_AV_PAIR* ntlm_av_pair_get(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList, N static BOOL ntlm_av_pair_add(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList, NTLM_AV_ID AvId, PBYTE Value, UINT16 AvLen) { - size_t cbAvPair; - NTLM_AV_PAIR* pAvPair; + size_t cbAvPair = 0; + NTLM_AV_PAIR* pAvPair = NULL; pAvPair = ntlm_av_pair_get(pAvPairList, cbAvPairList, MsvAvEOL, &cbAvPair); @@ -281,8 +281,8 @@ static BOOL ntlm_av_pair_add(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList, NTL static BOOL ntlm_av_pair_add_copy(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList, NTLM_AV_PAIR* pAvPair, size_t cbAvPair) { - UINT16 pair; - size_t avLen; + UINT16 pair = 0; + size_t avLen = 0; if (!ntlm_av_pair_check(pAvPair, cbAvPair)) return FALSE; @@ -300,10 +300,10 @@ static BOOL ntlm_av_pair_add_copy(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList static int ntlm_get_target_computer_name(PUNICODE_STRING pName, COMPUTER_NAME_FORMAT type) { - char* name; + char* name = NULL; int status = -1; DWORD nSize = 0; - CHAR* computerName; + CHAR* computerName = NULL; WINPR_ASSERT(pName); @@ -403,10 +403,10 @@ static BOOL ntlm_md5_update_uint32_be(WINPR_DIGEST_CTX* md5, UINT32 num) static void ntlm_compute_channel_bindings(NTLM_CONTEXT* context) { - WINPR_DIGEST_CTX* md5; - BYTE* ChannelBindingToken; - UINT32 ChannelBindingTokenLength; - SEC_CHANNEL_BINDINGS* ChannelBindings; + WINPR_DIGEST_CTX* md5 = NULL; + BYTE* ChannelBindingToken = NULL; + UINT32 ChannelBindingTokenLength = 0; + SEC_CHANNEL_BINDINGS* ChannelBindings = NULL; WINPR_ASSERT(context); @@ -471,11 +471,11 @@ static void ntlm_compute_single_host_data(NTLM_CONTEXT* context) BOOL ntlm_construct_challenge_target_info(NTLM_CONTEXT* context) { BOOL rc = FALSE; - ULONG length; - ULONG AvPairsCount; - ULONG AvPairsLength; - NTLM_AV_PAIR* pAvPairList; - size_t cbAvPairList; + ULONG length = 0; + ULONG AvPairsCount = 0; + ULONG AvPairsLength = 0; + NTLM_AV_PAIR* pAvPairList = NULL; + size_t cbAvPairList = 0; UNICODE_STRING NbDomainName = { 0 }; UNICODE_STRING NbComputerName = { 0 }; UNICODE_STRING DnsDomainName = { 0 }; @@ -546,25 +546,25 @@ fail: BOOL ntlm_construct_authenticate_target_info(NTLM_CONTEXT* context) { - ULONG size; - ULONG AvPairsCount; - ULONG AvPairsValueLength; - NTLM_AV_PAIR* AvTimestamp; - NTLM_AV_PAIR* AvNbDomainName; - NTLM_AV_PAIR* AvNbComputerName; - NTLM_AV_PAIR* AvDnsDomainName; - NTLM_AV_PAIR* AvDnsComputerName; - NTLM_AV_PAIR* AvDnsTreeName; - NTLM_AV_PAIR* ChallengeTargetInfo; - NTLM_AV_PAIR* AuthenticateTargetInfo; - size_t cbAvTimestamp; - size_t cbAvNbDomainName; - size_t cbAvNbComputerName; - size_t cbAvDnsDomainName; - size_t cbAvDnsComputerName; - size_t cbAvDnsTreeName; - size_t cbChallengeTargetInfo; - size_t cbAuthenticateTargetInfo; + ULONG size = 0; + ULONG AvPairsCount = 0; + ULONG AvPairsValueLength = 0; + NTLM_AV_PAIR* AvTimestamp = NULL; + NTLM_AV_PAIR* AvNbDomainName = NULL; + NTLM_AV_PAIR* AvNbComputerName = NULL; + NTLM_AV_PAIR* AvDnsDomainName = NULL; + NTLM_AV_PAIR* AvDnsComputerName = NULL; + NTLM_AV_PAIR* AvDnsTreeName = NULL; + NTLM_AV_PAIR* ChallengeTargetInfo = NULL; + NTLM_AV_PAIR* AuthenticateTargetInfo = NULL; + size_t cbAvTimestamp = 0; + size_t cbAvNbDomainName = 0; + size_t cbAvNbComputerName = 0; + size_t cbAvDnsDomainName = 0; + size_t cbAvDnsComputerName = 0; + size_t cbAvDnsTreeName = 0; + size_t cbChallengeTargetInfo = 0; + size_t cbAuthenticateTargetInfo = 0; WINPR_ASSERT(context); @@ -587,7 +587,7 @@ BOOL ntlm_construct_authenticate_target_info(NTLM_CONTEXT* context) if (AvNbDomainName) { - size_t avLen; + size_t avLen = 0; if (!ntlm_av_pair_get_len(AvNbDomainName, cbAvNbDomainName, &avLen)) goto fail; AvPairsCount++; /* MsvAvNbDomainName */ @@ -596,7 +596,7 @@ BOOL ntlm_construct_authenticate_target_info(NTLM_CONTEXT* context) if (AvNbComputerName) { - size_t avLen; + size_t avLen = 0; if (!ntlm_av_pair_get_len(AvNbComputerName, cbAvNbComputerName, &avLen)) goto fail; AvPairsCount++; /* MsvAvNbComputerName */ @@ -605,7 +605,7 @@ BOOL ntlm_construct_authenticate_target_info(NTLM_CONTEXT* context) if (AvDnsDomainName) { - size_t avLen; + size_t avLen = 0; if (!ntlm_av_pair_get_len(AvDnsDomainName, cbAvDnsDomainName, &avLen)) goto fail; AvPairsCount++; /* MsvAvDnsDomainName */ @@ -614,7 +614,7 @@ BOOL ntlm_construct_authenticate_target_info(NTLM_CONTEXT* context) if (AvDnsComputerName) { - size_t avLen; + size_t avLen = 0; if (!ntlm_av_pair_get_len(AvDnsComputerName, cbAvDnsComputerName, &avLen)) goto fail; AvPairsCount++; /* MsvAvDnsComputerName */ @@ -623,7 +623,7 @@ BOOL ntlm_construct_authenticate_target_info(NTLM_CONTEXT* context) if (AvDnsTreeName) { - size_t avLen; + size_t avLen = 0; if (!ntlm_av_pair_get_len(AvDnsTreeName, cbAvDnsTreeName, &avLen)) goto fail; AvPairsCount++; /* MsvAvDnsTreeName */ @@ -726,7 +726,7 @@ BOOL ntlm_construct_authenticate_target_info(NTLM_CONTEXT* context) if (context->UseMIC) { - UINT32 flags; + UINT32 flags = 0; Data_Write_UINT32(&flags, MSV_AV_FLAGS_MESSAGE_INTEGRITY_CHECK); if (!ntlm_av_pair_add(AuthenticateTargetInfo, cbAuthenticateTargetInfo, MsvAvFlags, @@ -760,7 +760,7 @@ BOOL ntlm_construct_authenticate_target_info(NTLM_CONTEXT* context) if (context->NTLMv2) { - NTLM_AV_PAIR* AvEOL; + NTLM_AV_PAIR* AvEOL = NULL; AvEOL = ntlm_av_pair_get(ChallengeTargetInfo, cbChallengeTargetInfo, MsvAvEOL, NULL); if (!AvEOL) diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_compute.c b/winpr/libwinpr/sspi/NTLM/ntlm_compute.c index b60a3c9ea..9c6e81890 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_compute.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_compute.c @@ -154,7 +154,7 @@ void ntlm_print_version_info(const NTLM_VERSION_INFO* versionInfo) static BOOL ntlm_read_ntlm_v2_client_challenge(wStream* s, NTLMv2_CLIENT_CHALLENGE* challenge) { - size_t size; + size_t size = 0; WINPR_ASSERT(s); WINPR_ASSERT(challenge); @@ -193,7 +193,7 @@ static BOOL ntlm_read_ntlm_v2_client_challenge(wStream* s, NTLMv2_CLIENT_CHALLEN static BOOL ntlm_write_ntlm_v2_client_challenge(wStream* s, const NTLMv2_CLIENT_CHALLENGE* challenge) { - ULONG length; + ULONG length = 0; WINPR_ASSERT(s); WINPR_ASSERT(challenge); @@ -280,7 +280,7 @@ static BOOL ntlm_fetch_ntlm_v2_hash(NTLM_CONTEXT* context, BYTE* hash) BOOL rc = FALSE; WINPR_SAM* sam = NULL; WINPR_SAM_ENTRY* entry = NULL; - SSPI_CREDENTIALS* credentials; + SSPI_CREDENTIALS* credentials = NULL; WINPR_ASSERT(context); WINPR_ASSERT(hash); @@ -360,7 +360,7 @@ static int ntlm_convert_password_hash(NTLM_CONTEXT* context, BYTE* hash) static BOOL ntlm_compute_ntlm_v2_hash(NTLM_CONTEXT* context, BYTE* hash) { - SSPI_CREDENTIALS* credentials; + SSPI_CREDENTIALS* credentials = NULL; WINPR_ASSERT(context); WINPR_ASSERT(hash); @@ -419,7 +419,7 @@ static BOOL ntlm_compute_ntlm_v2_hash(NTLM_CONTEXT* context, BYTE* hash) } else if (context->HashCallback) { - int ret; + int ret = 0; SecBuffer proofValue; SecBuffer micValue; @@ -450,7 +450,7 @@ static BOOL ntlm_compute_ntlm_v2_hash(NTLM_CONTEXT* context, BYTE* hash) BOOL ntlm_compute_lm_v2_response(NTLM_CONTEXT* context) { - BYTE* response; + BYTE* response = NULL; BYTE value[WINPR_MD5_DIGEST_LENGTH] = { 0 }; WINPR_ASSERT(context); @@ -498,10 +498,10 @@ BOOL ntlm_compute_lm_v2_response(NTLM_CONTEXT* context) BOOL ntlm_compute_ntlm_v2_response(NTLM_CONTEXT* context) { - BYTE* blob; + BYTE* blob = NULL; SecBuffer ntlm_v2_temp = { 0 }; SecBuffer ntlm_v2_temp_chal = { 0 }; - PSecBuffer TargetInfo; + PSecBuffer TargetInfo = NULL; WINPR_ASSERT(context); @@ -707,7 +707,7 @@ static BOOL ntlm_generate_signing_key(BYTE* exported_session_key, const SecBuffe BYTE* signing_key) { BOOL rc = FALSE; - size_t length; + size_t length = 0; BYTE* value = NULL; WINPR_ASSERT(exported_session_key); diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_message.c b/winpr/libwinpr/sspi/NTLM/ntlm_message.c index 609bcf37e..89e57e55c 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_message.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_message.c @@ -127,7 +127,7 @@ static void ntlm_print_message_fields(const NTLM_MESSAGE_FIELDS* fields, const c static void ntlm_print_negotiate_flags(UINT32 flags) { - int i; + int i = 0; WLog_VRB(TAG, "negotiateFlags \"0x%08" PRIX32 "\"", flags); @@ -313,7 +313,7 @@ static BOOL ntlm_read_message_fields(wStream* s, NTLM_MESSAGE_FIELDS* fields) static BOOL ntlm_write_message_fields(wStream* s, const NTLM_MESSAGE_FIELDS* fields) { - UINT16 MaxLen; + UINT16 MaxLen = 0; WINPR_ASSERT(s); WINPR_ASSERT(fields); @@ -466,7 +466,7 @@ static BOOL ntlm_read_message_integrity_check(wStream* s, size_t* offset, BYTE* static BOOL ntlm_write_message_integrity_check(wStream* s, size_t offset, const BYTE* data, size_t size, const char* name) { - size_t pos; + size_t pos = 0; WINPR_ASSERT(s); WINPR_ASSERT(data); @@ -490,10 +490,10 @@ static BOOL ntlm_write_message_integrity_check(wStream* s, size_t offset, const SECURITY_STATUS ntlm_read_NegotiateMessage(NTLM_CONTEXT* context, PSecBuffer buffer) { wStream sbuffer; - wStream* s; - size_t length; + wStream* s = NULL; + size_t length = 0; const NTLM_NEGOTIATE_MESSAGE empty = { 0 }; - NTLM_NEGOTIATE_MESSAGE* message; + NTLM_NEGOTIATE_MESSAGE* message = NULL; WINPR_ASSERT(context); WINPR_ASSERT(buffer); @@ -564,10 +564,10 @@ SECURITY_STATUS ntlm_read_NegotiateMessage(NTLM_CONTEXT* context, PSecBuffer buf SECURITY_STATUS ntlm_write_NegotiateMessage(NTLM_CONTEXT* context, const PSecBuffer buffer) { wStream sbuffer; - wStream* s; - size_t length; + wStream* s = NULL; + size_t length = 0; const NTLM_NEGOTIATE_MESSAGE empty = { 0 }; - NTLM_NEGOTIATE_MESSAGE* message; + NTLM_NEGOTIATE_MESSAGE* message = NULL; WINPR_ASSERT(context); WINPR_ASSERT(buffer); @@ -655,13 +655,13 @@ SECURITY_STATUS ntlm_read_ChallengeMessage(NTLM_CONTEXT* context, PSecBuffer buf { SECURITY_STATUS status = SEC_E_INVALID_TOKEN; wStream sbuffer; - wStream* s; - size_t length; - size_t StartOffset; - size_t PayloadOffset; - NTLM_AV_PAIR* AvTimestamp; + wStream* s = NULL; + size_t length = 0; + size_t StartOffset = 0; + size_t PayloadOffset = 0; + NTLM_AV_PAIR* AvTimestamp = NULL; const NTLM_CHALLENGE_MESSAGE empty = { 0 }; - NTLM_CHALLENGE_MESSAGE* message; + NTLM_CHALLENGE_MESSAGE* message = NULL; if (!context || !buffer) return SEC_E_INTERNAL_ERROR; @@ -718,7 +718,7 @@ SECURITY_STATUS ntlm_read_ChallengeMessage(NTLM_CONTEXT* context, PSecBuffer buf if (message->TargetInfo.Len > 0) { - size_t cbAvTimestamp; + size_t cbAvTimestamp = 0; if (!ntlm_read_message_fields_buffer(s, &(message->TargetInfo))) goto fail; @@ -804,11 +804,11 @@ fail: SECURITY_STATUS ntlm_write_ChallengeMessage(NTLM_CONTEXT* context, const PSecBuffer buffer) { wStream sbuffer; - wStream* s; - size_t length; - UINT32 PayloadOffset; + wStream* s = NULL; + size_t length = 0; + UINT32 PayloadOffset = 0; const NTLM_CHALLENGE_MESSAGE empty = { 0 }; - NTLM_CHALLENGE_MESSAGE* message; + NTLM_CHALLENGE_MESSAGE* message = NULL; WINPR_ASSERT(context); WINPR_ASSERT(buffer); @@ -916,14 +916,14 @@ SECURITY_STATUS ntlm_read_AuthenticateMessage(NTLM_CONTEXT* context, PSecBuffer { SECURITY_STATUS status = SEC_E_INVALID_TOKEN; wStream sbuffer; - wStream* s; - size_t length; + wStream* s = NULL; + size_t length = 0; UINT32 flags = 0; NTLM_AV_PAIR* AvFlags = NULL; - size_t PayloadBufferOffset; + size_t PayloadBufferOffset = 0; const NTLM_AUTHENTICATE_MESSAGE empty = { 0 }; - NTLM_AUTHENTICATE_MESSAGE* message; - SSPI_CREDENTIALS* credentials; + NTLM_AUTHENTICATE_MESSAGE* message = NULL; + SSPI_CREDENTIALS* credentials = NULL; WINPR_ASSERT(context); WINPR_ASSERT(buffer); @@ -1004,7 +1004,7 @@ SECURITY_STATUS ntlm_read_AuthenticateMessage(NTLM_CONTEXT* context, PSecBuffer if (message->NtChallengeResponse.Len > 0) { - size_t cbAvFlags; + size_t cbAvFlags = 0; wStream ssbuffer; wStream* snt = Stream_StaticConstInit(&ssbuffer, message->NtChallengeResponse.Buffer, message->NtChallengeResponse.Len); @@ -1201,12 +1201,12 @@ fail: SECURITY_STATUS ntlm_write_AuthenticateMessage(NTLM_CONTEXT* context, const PSecBuffer buffer) { wStream sbuffer; - wStream* s; - size_t length; - UINT32 PayloadBufferOffset; + wStream* s = NULL; + size_t length = 0; + UINT32 PayloadBufferOffset = 0; const NTLM_AUTHENTICATE_MESSAGE empty = { 0 }; - NTLM_AUTHENTICATE_MESSAGE* message; - SSPI_CREDENTIALS* credentials; + NTLM_AUTHENTICATE_MESSAGE* message = NULL; + SSPI_CREDENTIALS* credentials = NULL; WINPR_ASSERT(context); WINPR_ASSERT(buffer); diff --git a/winpr/libwinpr/sspi/Negotiate/negotiate.c b/winpr/libwinpr/sspi/Negotiate/negotiate.c index 88421ac64..62b33fc45 100644 --- a/winpr/libwinpr/sspi/Negotiate/negotiate.c +++ b/winpr/libwinpr/sspi/Negotiate/negotiate.c @@ -294,7 +294,7 @@ static BOOL negotiate_get_config_from_auth_package_list(void* pAuthData, BOOL* k static BOOL negotiate_get_config(void* pAuthData, BOOL* kerberos, BOOL* ntlm) { HKEY hKey = NULL; - LONG rc; + LONG rc = 0; WINPR_ASSERT(kerberos); WINPR_ASSERT(ntlm); @@ -314,7 +314,7 @@ static BOOL negotiate_get_config(void* pAuthData, BOOL* kerberos, BOOL* ntlm) rc = RegOpenKeyExA(HKEY_LOCAL_MACHINE, NEGO_REG_KEY, 0, KEY_READ | KEY_WOW64_64KEY, &hKey); if (rc == ERROR_SUCCESS) { - DWORD dwValue; + DWORD dwValue = 0; if (negotiate_get_dword(hKey, "kerberos", &dwValue)) *kerberos = (dwValue != 0) ? TRUE : FALSE; @@ -341,7 +341,7 @@ static BOOL negotiate_write_neg_token(PSecBuffer output_buffer, NegToken* token) WinPrAsn1_OctetString mechToken = { token->mechToken.cbBuffer, token->mechToken.pvBuffer }; WinPrAsn1_OctetString mechListMic = { token->mic.cbBuffer, token->mic.pvBuffer }; wStream s; - size_t len; + size_t len = 0; enc = WinPrAsn1Encoder_New(WINPR_ASN1_DER); if (!enc) @@ -436,11 +436,11 @@ static BOOL negotiate_read_neg_token(PSecBuffer input, NegToken* token) WinPrAsn1Decoder dec; WinPrAsn1Decoder dec2; WinPrAsn1_OID oid; - WinPrAsn1_tagId contextual; - WinPrAsn1_tag tag; - size_t len; + WinPrAsn1_tagId contextual = 0; + WinPrAsn1_tag tag = 0; + size_t len = 0; WinPrAsn1_OctetString octet_string; - BOOL err; + BOOL err = 0; WINPR_ASSERT(input); WINPR_ASSERT(token); @@ -498,7 +498,7 @@ static BOOL negotiate_read_neg_token(PSecBuffer input, NegToken* token) else { /* negState [0] ENUMERATED */ - WinPrAsn1_ENUMERATED rd; + WinPrAsn1_ENUMERATED rd = 0; if (!WinPrAsn1DecReadEnumerated(&dec2, &rd)) return FALSE; token->negState = rd; @@ -554,7 +554,7 @@ static SECURITY_STATUS negotiate_mic_exchange(NEGOTIATE_CONTEXT* context, NegTok { SecBuffer mic_buffers[2] = { 0 }; SecBufferDesc mic_buffer_desc = { SECBUFFER_VERSION, 2, mic_buffers }; - SECURITY_STATUS status; + SECURITY_STATUS status = 0; WINPR_ASSERT(context); WINPR_ASSERT(input_token); @@ -614,7 +614,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextW( { NEGOTIATE_CONTEXT* context = NULL; NEGOTIATE_CONTEXT init_context = { 0 }; - MechCred* creds; + MechCred* creds = NULL; PCtxtHandle sub_context = NULL; PCredHandle sub_cred = NULL; NegToken input_token = empty_neg_token; @@ -629,7 +629,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextW( SECURITY_STATUS sub_status = SEC_E_INTERNAL_ERROR; WinPrAsn1Encoder* enc = NULL; wStream s; - const Mech* mech; + const Mech* mech = NULL; if (!phCredential || !SecIsValidHandle(phCredential)) return SEC_E_NO_CREDENTIALS; @@ -887,7 +887,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextA( ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; SEC_WCHAR* pszTargetNameW = NULL; if (pszTargetName) @@ -908,7 +908,7 @@ static const Mech* guessMech(PSecBuffer input_buffer, BOOL* spNego, WinPrAsn1_OI { WinPrAsn1Decoder decoder; WinPrAsn1Decoder appDecoder; - WinPrAsn1_tagId tag; + WinPrAsn1_tagId tag = 0; *spNego = FALSE; @@ -945,7 +945,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_AcceptSecurityContext( { NEGOTIATE_CONTEXT* context = NULL; NEGOTIATE_CONTEXT init_context = { 0 }; - MechCred* creds; + MechCred* creds = NULL; PCredHandle sub_cred = NULL; NegToken input_token = empty_neg_token; NegToken output_token = empty_neg_token; @@ -956,7 +956,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_AcceptSecurityContext( SECURITY_STATUS status = SEC_E_INTERNAL_ERROR; WinPrAsn1Decoder dec; WinPrAsn1Decoder dec2; - WinPrAsn1_tagId tag; + WinPrAsn1_tagId tag = 0; WinPrAsn1_OID oid = { 0 }; const Mech* first_mech = NULL; @@ -1175,7 +1175,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_AcceptSecurityContext( static SECURITY_STATUS SEC_ENTRY negotiate_CompleteAuthToken(PCtxtHandle phContext, PSecBufferDesc pToken) { - NEGOTIATE_CONTEXT* context; + NEGOTIATE_CONTEXT* context = NULL; SECURITY_STATUS status = SEC_E_OK; context = (NEGOTIATE_CONTEXT*)sspi_SecureHandleGetLowerPointer(phContext); @@ -1193,10 +1193,10 @@ static SECURITY_STATUS SEC_ENTRY negotiate_CompleteAuthToken(PCtxtHandle phConte static SECURITY_STATUS SEC_ENTRY negotiate_DeleteSecurityContext(PCtxtHandle phContext) { - NEGOTIATE_CONTEXT* context; + NEGOTIATE_CONTEXT* context = NULL; SECURITY_STATUS status = SEC_E_OK; context = (NEGOTIATE_CONTEXT*)sspi_SecureHandleGetLowerPointer(phContext); - const SecPkg* pkg; + const SecPkg* pkg = NULL; if (!context) return SEC_E_INVALID_HANDLE; @@ -1301,9 +1301,9 @@ static SECURITY_STATUS SEC_ENTRY negotiate_SetCredentialsAttributesW(PCredHandle ULONG ulAttribute, void* pBuffer, ULONG cbBuffer) { - MechCred* creds; + MechCred* creds = NULL; BOOL success = FALSE; - SECURITY_STATUS secStatus; + SECURITY_STATUS secStatus = 0; creds = sspi_SecureHandleGetLowerPointer(phCredential); @@ -1335,9 +1335,9 @@ static SECURITY_STATUS SEC_ENTRY negotiate_SetCredentialsAttributesA(PCredHandle ULONG ulAttribute, void* pBuffer, ULONG cbBuffer) { - MechCred* creds; + MechCred* creds = NULL; BOOL success = FALSE; - SECURITY_STATUS secStatus; + SECURITY_STATUS secStatus = 0; creds = sspi_SecureHandleGetLowerPointer(phCredential); @@ -1373,8 +1373,8 @@ static SECURITY_STATUS SEC_ENTRY negotiate_AcquireCredentialsHandleW( void* pAuthData, SEC_GET_KEY_FN pGetKeyFn, void* pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - BOOL kerberos; - BOOL ntlm; + BOOL kerberos = 0; + BOOL ntlm = 0; if (!negotiate_get_config(pAuthData, &kerberos, &ntlm)) return SEC_E_INTERNAL_ERROR; @@ -1415,8 +1415,8 @@ static SECURITY_STATUS SEC_ENTRY negotiate_AcquireCredentialsHandleA( void* pAuthData, SEC_GET_KEY_FN pGetKeyFn, void* pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - BOOL kerberos; - BOOL ntlm; + BOOL kerberos = 0; + BOOL ntlm = 0; if (!negotiate_get_config(pAuthData, &kerberos, &ntlm)) return SEC_E_INTERNAL_ERROR; @@ -1471,7 +1471,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_QueryCredentialsAttributesA(PCredHand static SECURITY_STATUS SEC_ENTRY negotiate_FreeCredentialsHandle(PCredHandle phCredential) { - MechCred* creds; + MechCred* creds = NULL; creds = sspi_SecureHandleGetLowerPointer(phCredential); if (!creds) diff --git a/winpr/libwinpr/sspi/Schannel/schannel.c b/winpr/libwinpr/sspi/Schannel/schannel.c index 2270198f8..45fba37f9 100644 --- a/winpr/libwinpr/sspi/Schannel/schannel.c +++ b/winpr/libwinpr/sspi/Schannel/schannel.c @@ -33,7 +33,7 @@ static char* SCHANNEL_PACKAGE_NAME = "Schannel"; SCHANNEL_CONTEXT* schannel_ContextNew(void) { - SCHANNEL_CONTEXT* context; + SCHANNEL_CONTEXT* context = NULL; context = (SCHANNEL_CONTEXT*)calloc(1, sizeof(SCHANNEL_CONTEXT)); if (!context) @@ -61,7 +61,7 @@ void schannel_ContextFree(SCHANNEL_CONTEXT* context) static SCHANNEL_CREDENTIALS* schannel_CredentialsNew(void) { - SCHANNEL_CREDENTIALS* credentials; + SCHANNEL_CREDENTIALS* credentials = NULL; credentials = (SCHANNEL_CREDENTIALS*)calloc(1, sizeof(SCHANNEL_CREDENTIALS)); return credentials; } @@ -130,11 +130,11 @@ static SECURITY_STATUS SEC_ENTRY schannel_AcquireCredentialsHandleW( void* pAuthData, SEC_GET_KEY_FN pGetKeyFn, void* pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - SCHANNEL_CREDENTIALS* credentials; + SCHANNEL_CREDENTIALS* credentials = NULL; if (fCredentialUse == SECPKG_CRED_OUTBOUND) { - SCHANNEL_CRED* cred; + SCHANNEL_CRED* cred = NULL; credentials = schannel_CredentialsNew(); credentials->fCredentialUse = fCredentialUse; cred = (SCHANNEL_CRED*)pAuthData; @@ -165,7 +165,7 @@ static SECURITY_STATUS SEC_ENTRY schannel_AcquireCredentialsHandleA( void* pAuthData, SEC_GET_KEY_FN pGetKeyFn, void* pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; SEC_WCHAR* pszPrincipalW = NULL; SEC_WCHAR* pszPackageW = NULL; if (pszPrincipal) @@ -183,7 +183,7 @@ static SECURITY_STATUS SEC_ENTRY schannel_AcquireCredentialsHandleA( static SECURITY_STATUS SEC_ENTRY schannel_FreeCredentialsHandle(PCredHandle phCredential) { - SCHANNEL_CREDENTIALS* credentials; + SCHANNEL_CREDENTIALS* credentials = NULL; if (!phCredential) return SEC_E_INVALID_HANDLE; @@ -202,9 +202,9 @@ static SECURITY_STATUS SEC_ENTRY schannel_InitializeSecurityContextW( ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; - SCHANNEL_CONTEXT* context; - SCHANNEL_CREDENTIALS* credentials; + SECURITY_STATUS status = 0; + SCHANNEL_CONTEXT* context = NULL; + SCHANNEL_CREDENTIALS* credentials = NULL; /* behave like windows SSPIs that don't want empty context */ if (phContext && !phContext->dwLower && !phContext->dwUpper) @@ -236,7 +236,7 @@ static SECURITY_STATUS SEC_ENTRY schannel_InitializeSecurityContextA( ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; SEC_WCHAR* pszTargetNameW = NULL; if (pszTargetName != NULL) @@ -258,8 +258,8 @@ static SECURITY_STATUS SEC_ENTRY schannel_AcceptSecurityContext( ULONG TargetDataRep, PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsTimeStamp) { - SECURITY_STATUS status; - SCHANNEL_CONTEXT* context; + SECURITY_STATUS status = 0; + SCHANNEL_CONTEXT* context = NULL; /* behave like windows SSPIs that don't want empty context */ if (phContext && !phContext->dwLower && !phContext->dwUpper) @@ -286,7 +286,7 @@ static SECURITY_STATUS SEC_ENTRY schannel_AcceptSecurityContext( static SECURITY_STATUS SEC_ENTRY schannel_DeleteSecurityContext(PCtxtHandle phContext) { - SCHANNEL_CONTEXT* context; + SCHANNEL_CONTEXT* context = NULL; context = (SCHANNEL_CONTEXT*)sspi_SecureHandleGetLowerPointer(phContext); if (!context) @@ -346,8 +346,8 @@ static SECURITY_STATUS SEC_ENTRY schannel_EncryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo) { - SECURITY_STATUS status; - SCHANNEL_CONTEXT* context; + SECURITY_STATUS status = 0; + SCHANNEL_CONTEXT* context = NULL; context = (SCHANNEL_CONTEXT*)sspi_SecureHandleGetLowerPointer(phContext); if (!context) @@ -361,8 +361,8 @@ static SECURITY_STATUS SEC_ENTRY schannel_DecryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, ULONG* pfQOP) { - SECURITY_STATUS status; - SCHANNEL_CONTEXT* context; + SECURITY_STATUS status = 0; + SCHANNEL_CONTEXT* context = NULL; context = (SCHANNEL_CONTEXT*)sspi_SecureHandleGetLowerPointer(phContext); if (!context) diff --git a/winpr/libwinpr/sspi/Schannel/schannel_openssl.c b/winpr/libwinpr/sspi/Schannel/schannel_openssl.c index 17a8ee8f3..63c17d7e1 100644 --- a/winpr/libwinpr/sspi/Schannel/schannel_openssl.c +++ b/winpr/libwinpr/sspi/Schannel/schannel_openssl.c @@ -115,7 +115,7 @@ static const SSL_METHOD* get_method(BOOL server) } int schannel_openssl_client_init(SCHANNEL_OPENSSL* context) { - int status; + int status = 0; long options = 0; context->ctx = SSL_CTX_new(get_method(FALSE)); @@ -225,7 +225,7 @@ fail: int schannel_openssl_server_init(SCHANNEL_OPENSSL* context) { - int status; + int status = 0; unsigned long options = 0; context->ctx = SSL_CTX_new(get_method(TRUE)); @@ -360,9 +360,9 @@ SECURITY_STATUS schannel_openssl_client_process_tokens(SCHANNEL_OPENSSL* context PSecBufferDesc pInput, PSecBufferDesc pOutput) { - int status; - int ssl_error; - PSecBuffer pBuffer; + int status = 0; + int ssl_error = 0; + PSecBuffer pBuffer = NULL; if (!context->connected) { @@ -427,9 +427,9 @@ SECURITY_STATUS schannel_openssl_server_process_tokens(SCHANNEL_OPENSSL* context PSecBufferDesc pInput, PSecBufferDesc pOutput) { - int status; - int ssl_error; - PSecBuffer pBuffer; + int status = 0; + int ssl_error = 0; + PSecBuffer pBuffer = NULL; if (!context->connected) { @@ -494,11 +494,11 @@ SECURITY_STATUS schannel_openssl_server_process_tokens(SCHANNEL_OPENSSL* context SECURITY_STATUS schannel_openssl_encrypt_message(SCHANNEL_OPENSSL* context, PSecBufferDesc pMessage) { - int status; - int ssl_error; - PSecBuffer pStreamBodyBuffer; - PSecBuffer pStreamHeaderBuffer; - PSecBuffer pStreamTrailerBuffer; + int status = 0; + int ssl_error = 0; + PSecBuffer pStreamBodyBuffer = NULL; + PSecBuffer pStreamHeaderBuffer = NULL; + PSecBuffer pStreamTrailerBuffer = NULL; pStreamHeaderBuffer = sspi_FindSecBuffer(pMessage, SECBUFFER_STREAM_HEADER); pStreamBodyBuffer = sspi_FindSecBuffer(pMessage, SECBUFFER_DATA); pStreamTrailerBuffer = sspi_FindSecBuffer(pMessage, SECBUFFER_STREAM_TRAILER); @@ -520,7 +520,7 @@ SECURITY_STATUS schannel_openssl_encrypt_message(SCHANNEL_OPENSSL* context, PSec if (status > 0) { size_t ustatus = (size_t)status; - size_t length; + size_t length = 0; size_t offset = 0; length = @@ -542,11 +542,11 @@ SECURITY_STATUS schannel_openssl_encrypt_message(SCHANNEL_OPENSSL* context, PSec SECURITY_STATUS schannel_openssl_decrypt_message(SCHANNEL_OPENSSL* context, PSecBufferDesc pMessage) { - int status; - int length; - BYTE* buffer; - int ssl_error; - PSecBuffer pBuffer; + int status = 0; + int length = 0; + BYTE* buffer = NULL; + int ssl_error = 0; + PSecBuffer pBuffer = NULL; pBuffer = sspi_FindSecBuffer(pMessage, SECBUFFER_DATA); if (!pBuffer) @@ -579,7 +579,7 @@ SECURITY_STATUS schannel_openssl_decrypt_message(SCHANNEL_OPENSSL* context, PSec SCHANNEL_OPENSSL* schannel_openssl_new(void) { - SCHANNEL_OPENSSL* context; + SCHANNEL_OPENSSL* context = NULL; context = (SCHANNEL_OPENSSL*)calloc(1, sizeof(SCHANNEL_OPENSSL)); if (context != NULL) diff --git a/winpr/libwinpr/sspi/sspi.c b/winpr/libwinpr/sspi/sspi.c index f4cdeafad..acecb5b4f 100644 --- a/winpr/libwinpr/sspi/sspi.c +++ b/winpr/libwinpr/sspi/sspi.c @@ -504,7 +504,7 @@ SecurityFunctionTableA* SEC_ENTRY InitSecurityInterfaceExA(DWORD flags) SECURITY_STATUS SEC_ENTRY sspi_EnumerateSecurityPackagesW(ULONG* pcPackages, PSecPkgInfoW* ppPackageInfo) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->EnumerateSecurityPackagesW)) @@ -523,7 +523,7 @@ SECURITY_STATUS SEC_ENTRY sspi_EnumerateSecurityPackagesW(ULONG* pcPackages, SECURITY_STATUS SEC_ENTRY sspi_EnumerateSecurityPackagesA(ULONG* pcPackages, PSecPkgInfoA* ppPackageInfo) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiA && g_SspiA->EnumerateSecurityPackagesA)) @@ -556,7 +556,7 @@ SecurityFunctionTableA* SEC_ENTRY sspi_InitSecurityInterfaceA(void) SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityPackageInfoW(SEC_WCHAR* pszPackageName, PSecPkgInfoW* ppPackageInfo) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->QuerySecurityPackageInfoW)) @@ -575,7 +575,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityPackageInfoW(SEC_WCHAR* pszPackageNa SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityPackageInfoA(SEC_CHAR* pszPackageName, PSecPkgInfoA* ppPackageInfo) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiA && g_SspiA->QuerySecurityPackageInfoA)) @@ -598,7 +598,7 @@ SECURITY_STATUS SEC_ENTRY sspi_AcquireCredentialsHandleW( void* pAuthData, SEC_GET_KEY_FN pGetKeyFn, void* pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->AcquireCredentialsHandleW)) @@ -621,7 +621,7 @@ SECURITY_STATUS SEC_ENTRY sspi_AcquireCredentialsHandleA( void* pAuthData, SEC_GET_KEY_FN pGetKeyFn, void* pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiA && g_SspiA->AcquireCredentialsHandleA)) @@ -642,7 +642,7 @@ SECURITY_STATUS SEC_ENTRY sspi_AcquireCredentialsHandleA( SECURITY_STATUS SEC_ENTRY sspi_ExportSecurityContext(PCtxtHandle phContext, ULONG fFlags, PSecBuffer pPackedContext, HANDLE* pToken) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->ExportSecurityContext)) @@ -660,7 +660,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ExportSecurityContext(PCtxtHandle phContext, ULON SECURITY_STATUS SEC_ENTRY sspi_FreeCredentialsHandle(PCredHandle phCredential) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->FreeCredentialsHandle)) @@ -680,7 +680,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ImportSecurityContextW(SEC_WCHAR* pszPackage, PSecBuffer pPackedContext, HANDLE pToken, PCtxtHandle phContext) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->ImportSecurityContextW)) @@ -700,7 +700,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ImportSecurityContextA(SEC_CHAR* pszPackage, PSecBuffer pPackedContext, HANDLE pToken, PCtxtHandle phContext) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiA && g_SspiA->ImportSecurityContextA)) @@ -719,7 +719,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ImportSecurityContextA(SEC_CHAR* pszPackage, SECURITY_STATUS SEC_ENTRY sspi_QueryCredentialsAttributesW(PCredHandle phCredential, ULONG ulAttribute, void* pBuffer) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->QueryCredentialsAttributesW)) @@ -738,7 +738,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryCredentialsAttributesW(PCredHandle phCredent SECURITY_STATUS SEC_ENTRY sspi_QueryCredentialsAttributesA(PCredHandle phCredential, ULONG ulAttribute, void* pBuffer) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiA && g_SspiA->QueryCredentialsAttributesA)) @@ -763,7 +763,7 @@ SECURITY_STATUS SEC_ENTRY sspi_AcceptSecurityContext(PCredHandle phCredential, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsTimeStamp) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->AcceptSecurityContext)) @@ -783,7 +783,7 @@ SECURITY_STATUS SEC_ENTRY sspi_AcceptSecurityContext(PCredHandle phCredential, SECURITY_STATUS SEC_ENTRY sspi_ApplyControlToken(PCtxtHandle phContext, PSecBufferDesc pInput) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->ApplyControlToken)) @@ -801,7 +801,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ApplyControlToken(PCtxtHandle phContext, PSecBuff SECURITY_STATUS SEC_ENTRY sspi_CompleteAuthToken(PCtxtHandle phContext, PSecBufferDesc pToken) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->CompleteAuthToken)) @@ -819,7 +819,7 @@ SECURITY_STATUS SEC_ENTRY sspi_CompleteAuthToken(PCtxtHandle phContext, PSecBuff SECURITY_STATUS SEC_ENTRY sspi_DeleteSecurityContext(PCtxtHandle phContext) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->DeleteSecurityContext)) @@ -837,7 +837,7 @@ SECURITY_STATUS SEC_ENTRY sspi_DeleteSecurityContext(PCtxtHandle phContext) SECURITY_STATUS SEC_ENTRY sspi_FreeContextBuffer(void* pvContextBuffer) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->FreeContextBuffer)) @@ -855,7 +855,7 @@ SECURITY_STATUS SEC_ENTRY sspi_FreeContextBuffer(void* pvContextBuffer) SECURITY_STATUS SEC_ENTRY sspi_ImpersonateSecurityContext(PCtxtHandle phContext) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->ImpersonateSecurityContext)) @@ -876,7 +876,7 @@ SECURITY_STATUS SEC_ENTRY sspi_InitializeSecurityContextW( ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->InitializeSecurityContextW)) @@ -899,7 +899,7 @@ SECURITY_STATUS SEC_ENTRY sspi_InitializeSecurityContextA( ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiA && g_SspiA->InitializeSecurityContextA)) @@ -920,7 +920,7 @@ SECURITY_STATUS SEC_ENTRY sspi_InitializeSecurityContextA( SECURITY_STATUS SEC_ENTRY sspi_QueryContextAttributesW(PCtxtHandle phContext, ULONG ulAttribute, void* pBuffer) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->QueryContextAttributesW)) @@ -939,7 +939,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryContextAttributesW(PCtxtHandle phContext, UL SECURITY_STATUS SEC_ENTRY sspi_QueryContextAttributesA(PCtxtHandle phContext, ULONG ulAttribute, void* pBuffer) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiA && g_SspiA->QueryContextAttributesA)) @@ -957,7 +957,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryContextAttributesA(PCtxtHandle phContext, UL SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityContextToken(PCtxtHandle phContext, HANDLE* phToken) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->QuerySecurityContextToken)) @@ -976,7 +976,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityContextToken(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY sspi_SetContextAttributesW(PCtxtHandle phContext, ULONG ulAttribute, void* pBuffer, ULONG cbBuffer) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->SetContextAttributesW)) @@ -995,7 +995,7 @@ SECURITY_STATUS SEC_ENTRY sspi_SetContextAttributesW(PCtxtHandle phContext, ULON SECURITY_STATUS SEC_ENTRY sspi_SetContextAttributesA(PCtxtHandle phContext, ULONG ulAttribute, void* pBuffer, ULONG cbBuffer) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiA && g_SspiA->SetContextAttributesA)) @@ -1013,7 +1013,7 @@ SECURITY_STATUS SEC_ENTRY sspi_SetContextAttributesA(PCtxtHandle phContext, ULON SECURITY_STATUS SEC_ENTRY sspi_RevertSecurityContext(PCtxtHandle phContext) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->RevertSecurityContext)) @@ -1034,7 +1034,7 @@ SECURITY_STATUS SEC_ENTRY sspi_RevertSecurityContext(PCtxtHandle phContext) SECURITY_STATUS SEC_ENTRY sspi_DecryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->DecryptMessage)) @@ -1053,7 +1053,7 @@ SECURITY_STATUS SEC_ENTRY sspi_DecryptMessage(PCtxtHandle phContext, PSecBufferD SECURITY_STATUS SEC_ENTRY sspi_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->EncryptMessage)) @@ -1072,7 +1072,7 @@ SECURITY_STATUS SEC_ENTRY sspi_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, SECURITY_STATUS SEC_ENTRY sspi_MakeSignature(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->MakeSignature)) @@ -1091,7 +1091,7 @@ SECURITY_STATUS SEC_ENTRY sspi_MakeSignature(PCtxtHandle phContext, ULONG fQOP, SECURITY_STATUS SEC_ENTRY sspi_VerifySignature(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; InitOnceExecuteOnce(&g_Initialized, InitializeSspiModuleInt, NULL, NULL); if (!(g_SspiW && g_SspiW->VerifySignature)) diff --git a/winpr/libwinpr/sspi/sspi_gss.c b/winpr/libwinpr/sspi/sspi_gss.c index 0c9d45dbc..749973d20 100644 --- a/winpr/libwinpr/sspi/sspi_gss.c +++ b/winpr/libwinpr/sspi/sspi_gss.c @@ -30,11 +30,11 @@ BOOL sspi_gss_wrap_token(SecBuffer* buf, const WinPrAsn1_OID* oid, uint16_t tok_id, const sspi_gss_data* token) { - WinPrAsn1Encoder* enc; + WinPrAsn1Encoder* enc = NULL; BYTE tok_id_buf[2]; WinPrAsn1_MemoryChunk mc = { 2, tok_id_buf }; wStream s; - size_t len; + size_t len = 0; BOOL ret = FALSE; WINPR_ASSERT(buf); @@ -88,9 +88,9 @@ BOOL sspi_gss_unwrap_token(const SecBuffer* buf, WinPrAsn1_OID* oid, uint16_t* t { WinPrAsn1Decoder dec; WinPrAsn1Decoder dec2; - WinPrAsn1_tagId tag; + WinPrAsn1_tagId tag = 0; wStream sbuffer = { 0 }; - wStream* s; + wStream* s = NULL; WINPR_ASSERT(buf); WINPR_ASSERT(oid); diff --git a/winpr/libwinpr/sspi/sspi_winpr.c b/winpr/libwinpr/sspi/sspi_winpr.c index 8859aaf4b..f990dac47 100644 --- a/winpr/libwinpr/sspi/sspi_winpr.c +++ b/winpr/libwinpr/sspi/sspi_winpr.c @@ -104,7 +104,7 @@ static CONTEXT_BUFFER_ALLOC_TABLE ContextBufferAllocTable = { 0 }; static int sspi_ContextBufferAllocTableNew(void) { - size_t size; + size_t size = 0; ContextBufferAllocTable.entries = NULL; ContextBufferAllocTable.cEntries = 0; ContextBufferAllocTable.cMaxEntries = 4; @@ -119,8 +119,8 @@ static int sspi_ContextBufferAllocTableNew(void) static int sspi_ContextBufferAllocTableGrow(void) { - size_t size; - CONTEXT_BUFFER_ALLOC_ENTRY* entries; + size_t size = 0; + CONTEXT_BUFFER_ALLOC_ENTRY* entries = NULL; ContextBufferAllocTable.cEntries = 0; ContextBufferAllocTable.cMaxEntries *= 2; size = sizeof(CONTEXT_BUFFER_ALLOC_ENTRY) * ContextBufferAllocTable.cMaxEntries; @@ -155,8 +155,8 @@ static void sspi_ContextBufferAllocTableFree(void) static void* sspi_ContextBufferAlloc(UINT32 allocatorIndex, size_t size) { - UINT32 index; - void* contextBuffer; + UINT32 index = 0; + void* contextBuffer = NULL; for (index = 0; index < ContextBufferAllocTable.cMaxEntries; index++) { @@ -185,7 +185,7 @@ static void* sspi_ContextBufferAlloc(UINT32 allocatorIndex, size_t size) SSPI_CREDENTIALS* sspi_CredentialsNew(void) { - SSPI_CREDENTIALS* credentials; + SSPI_CREDENTIALS* credentials = NULL; credentials = (SSPI_CREDENTIALS*)calloc(1, sizeof(SSPI_CREDENTIALS)); return credentials; } @@ -268,7 +268,7 @@ SecHandle* sspi_SecureHandleAlloc(void) void* sspi_SecureHandleGetLowerPointer(SecHandle* handle) { - void* pointer; + void* pointer = NULL; if (!handle || !SecIsValidHandle(handle) || !handle->dwLower) return NULL; @@ -296,7 +296,7 @@ void sspi_SecureHandleSetLowerPointer(SecHandle* handle, void* pointer) void* sspi_SecureHandleGetUpperPointer(SecHandle* handle) { - void* pointer; + void* pointer = NULL; if (!handle || !SecIsValidHandle(handle) || !handle->dwUpper) return NULL; @@ -373,7 +373,7 @@ static void zfree(WCHAR* str, size_t len) int sspi_SetAuthIdentityA(SEC_WINNT_AUTH_IDENTITY* identity, const char* user, const char* domain, const char* password) { - int rc; + int rc = 0; size_t unicodeUserLenW = 0; size_t unicodeDomainLenW = 0; size_t unicodePasswordLenW = 0; @@ -392,7 +392,7 @@ int sspi_SetAuthIdentityA(SEC_WINNT_AUTH_IDENTITY* identity, const char* user, c UINT32 sspi_GetAuthIdentityVersion(const void* identity) { - UINT32 version; + UINT32 version = 0; if (!identity) return 0; @@ -410,7 +410,7 @@ UINT32 sspi_GetAuthIdentityVersion(const void* identity) UINT32 sspi_GetAuthIdentityFlags(const void* identity) { - UINT32 version; + UINT32 version = 0; UINT32 flags = 0; if (!identity) @@ -437,7 +437,7 @@ UINT32 sspi_GetAuthIdentityFlags(const void* identity) BOOL sspi_GetAuthIdentityUserDomainW(const void* identity, const WCHAR** pUser, UINT32* pUserLength, const WCHAR** pDomain, UINT32* pDomainLength) { - UINT32 version; + UINT32 version = 0; if (!identity) return FALSE; @@ -477,7 +477,7 @@ BOOL sspi_GetAuthIdentityUserDomainW(const void* identity, const WCHAR** pUser, BOOL sspi_GetAuthIdentityUserDomainA(const void* identity, const char** pUser, UINT32* pUserLength, const char** pDomain, UINT32* pDomainLength) { - UINT32 version; + UINT32 version = 0; if (!identity) return FALSE; @@ -517,7 +517,7 @@ BOOL sspi_GetAuthIdentityUserDomainA(const void* identity, const char** pUser, U BOOL sspi_GetAuthIdentityPasswordW(const void* identity, const WCHAR** pPassword, UINT32* pPasswordLength) { - UINT32 version; + UINT32 version = 0; if (!identity) return FALSE; @@ -547,7 +547,7 @@ BOOL sspi_GetAuthIdentityPasswordW(const void* identity, const WCHAR** pPassword BOOL sspi_GetAuthIdentityPasswordA(const void* identity, const char** pPassword, UINT32* pPasswordLength) { - UINT32 version; + UINT32 version = 0; if (!identity) return FALSE; @@ -767,8 +767,8 @@ cleanup: BOOL sspi_CopyAuthPackageListA(const SEC_WINNT_AUTH_IDENTITY_INFO* identity, char** pPackageList) { - UINT32 version; - UINT32 identityFlags; + UINT32 version = 0; + UINT32 identityFlags = 0; char* PackageList = NULL; const char* PackageListA = NULL; const WCHAR* PackageListW = NULL; @@ -828,8 +828,8 @@ BOOL sspi_CopyAuthPackageListA(const SEC_WINNT_AUTH_IDENTITY_INFO* identity, cha int sspi_CopyAuthIdentity(SEC_WINNT_AUTH_IDENTITY* identity, const SEC_WINNT_AUTH_IDENTITY_INFO* srcIdentity) { - int status; - UINT32 identityFlags; + int status = 0; + UINT32 identityFlags = 0; const char* UserA = NULL; const char* DomainA = NULL; const char* PasswordA = NULL; @@ -931,7 +931,7 @@ int sspi_CopyAuthIdentity(SEC_WINNT_AUTH_IDENTITY* identity, PSecBuffer sspi_FindSecBuffer(PSecBufferDesc pMessage, ULONG BufferType) { - ULONG index; + ULONG index = 0; PSecBuffer pSecBuffer = NULL; for (index = 0; index < pMessage->cBuffers; index++) @@ -989,8 +989,8 @@ void sspi_GlobalFinish(void) static const SecurityFunctionTableA* sspi_GetSecurityFunctionTableAByNameA(const SEC_CHAR* Name) { - int index; - UINT32 cPackages; + int index = 0; + UINT32 cPackages = 0; cPackages = sizeof(SecPkgInfoA_LIST) / sizeof(*(SecPkgInfoA_LIST)); for (index = 0; index < (int)cPackages; index++) @@ -1007,8 +1007,8 @@ static const SecurityFunctionTableA* sspi_GetSecurityFunctionTableAByNameA(const static const SecurityFunctionTableW* sspi_GetSecurityFunctionTableWByNameW(const SEC_WCHAR* Name) { - int index; - UINT32 cPackages; + int index = 0; + UINT32 cPackages = 0; cPackages = sizeof(SecPkgInfoW_LIST) / sizeof(*(SecPkgInfoW_LIST)); for (index = 0; index < (int)cPackages; index++) @@ -1046,8 +1046,8 @@ static void FreeContextBuffer_QuerySecurityPackageInfo(void* contextBuffer); static void sspi_ContextBufferFree(void* contextBuffer) { - UINT32 index; - UINT32 allocatorIndex; + UINT32 index = 0; + UINT32 allocatorIndex = 0; for (index = 0; index < ContextBufferAllocTable.cMaxEntries; index++) { @@ -1082,10 +1082,10 @@ static void sspi_ContextBufferFree(void* contextBuffer) static SECURITY_STATUS SEC_ENTRY winpr_EnumerateSecurityPackagesW(ULONG* pcPackages, PSecPkgInfoW* ppPackageInfo) { - int index; - size_t size; - UINT32 cPackages; - SecPkgInfoW* pPackageInfo; + int index = 0; + size_t size = 0; + UINT32 cPackages = 0; + SecPkgInfoW* pPackageInfo = NULL; cPackages = sizeof(SecPkgInfoW_LIST) / sizeof(*(SecPkgInfoW_LIST)); size = sizeof(SecPkgInfoW) * cPackages; pPackageInfo = (SecPkgInfoW*)sspi_ContextBufferAlloc(EnumerateSecurityPackagesIndex, size); @@ -1111,10 +1111,10 @@ static SECURITY_STATUS SEC_ENTRY winpr_EnumerateSecurityPackagesW(ULONG* pcPacka static SECURITY_STATUS SEC_ENTRY winpr_EnumerateSecurityPackagesA(ULONG* pcPackages, PSecPkgInfoA* ppPackageInfo) { - int index; - size_t size; - UINT32 cPackages; - SecPkgInfoA* pPackageInfo; + int index = 0; + size_t size = 0; + UINT32 cPackages = 0; + SecPkgInfoA* pPackageInfo = NULL; cPackages = sizeof(SecPkgInfoA_LIST) / sizeof(*(SecPkgInfoA_LIST)); size = sizeof(SecPkgInfoA) * cPackages; pPackageInfo = (SecPkgInfoA*)sspi_ContextBufferAlloc(EnumerateSecurityPackagesIndex, size); @@ -1145,8 +1145,8 @@ static SECURITY_STATUS SEC_ENTRY winpr_EnumerateSecurityPackagesA(ULONG* pcPacka static void FreeContextBuffer_EnumerateSecurityPackages(void* contextBuffer) { - int index; - UINT32 cPackages; + int index = 0; + UINT32 cPackages = 0; SecPkgInfoA* pPackageInfo = (SecPkgInfoA*)contextBuffer; cPackages = sizeof(SecPkgInfoA_LIST) / sizeof(*(SecPkgInfoA_LIST)); @@ -1175,10 +1175,10 @@ SecurityFunctionTableA* SEC_ENTRY winpr_InitSecurityInterfaceA(void) static SECURITY_STATUS SEC_ENTRY winpr_QuerySecurityPackageInfoW(SEC_WCHAR* pszPackageName, PSecPkgInfoW* ppPackageInfo) { - int index; - size_t size; - UINT32 cPackages; - SecPkgInfoW* pPackageInfo; + int index = 0; + size_t size = 0; + UINT32 cPackages = 0; + SecPkgInfoW* pPackageInfo = NULL; cPackages = sizeof(SecPkgInfoW_LIST) / sizeof(*(SecPkgInfoW_LIST)); for (index = 0; index < (int)cPackages; index++) @@ -1210,10 +1210,10 @@ static SECURITY_STATUS SEC_ENTRY winpr_QuerySecurityPackageInfoW(SEC_WCHAR* pszP static SECURITY_STATUS SEC_ENTRY winpr_QuerySecurityPackageInfoA(SEC_CHAR* pszPackageName, PSecPkgInfoA* ppPackageInfo) { - int index; - size_t size; - UINT32 cPackages; - SecPkgInfoA* pPackageInfo; + int index = 0; + size_t size = 0; + UINT32 cPackages = 0; + SecPkgInfoA* pPackageInfo = NULL; cPackages = sizeof(SecPkgInfoA_LIST) / sizeof(*(SecPkgInfoA_LIST)); for (index = 0; index < (int)cPackages; index++) @@ -1268,7 +1268,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_AcquireCredentialsHandleW( void* pAuthData, SEC_GET_KEY_FN pGetKeyFn, void* pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; const SecurityFunctionTableW* table = sspi_GetSecurityFunctionTableWByNameW(pszPackage); if (!table) @@ -1298,7 +1298,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_AcquireCredentialsHandleA( void* pAuthData, SEC_GET_KEY_FN pGetKeyFn, void* pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - SECURITY_STATUS status; + SECURITY_STATUS status = 0; const SecurityFunctionTableA* table = sspi_GetSecurityFunctionTableAByNameA(pszPackage); if (!table) @@ -1327,9 +1327,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_ExportSecurityContext(PCtxtHandle phConte PSecBuffer pPackedContext, HANDLE* pToken) { - SEC_CHAR* Name; - SECURITY_STATUS status; - const SecurityFunctionTableW* table; + SEC_CHAR* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableW* table = NULL; Name = (SEC_CHAR*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -1359,9 +1359,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_ExportSecurityContext(PCtxtHandle phConte static SECURITY_STATUS SEC_ENTRY winpr_FreeCredentialsHandle(PCredHandle phCredential) { - char* Name; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + char* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (char*)sspi_SecureHandleGetUpperPointer(phCredential); if (!Name) @@ -1393,9 +1393,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_ImportSecurityContextW(SEC_WCHAR* pszPack PSecBuffer pPackedContext, HANDLE pToken, PCtxtHandle phContext) { - SEC_CHAR* Name; - SECURITY_STATUS status; - const SecurityFunctionTableW* table; + SEC_CHAR* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableW* table = NULL; Name = (SEC_CHAR*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -1428,8 +1428,8 @@ static SECURITY_STATUS SEC_ENTRY winpr_ImportSecurityContextA(SEC_CHAR* pszPacka HANDLE pToken, PCtxtHandle phContext) { char* Name = NULL; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (char*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -1460,9 +1460,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_ImportSecurityContextA(SEC_CHAR* pszPacka static SECURITY_STATUS SEC_ENTRY winpr_QueryCredentialsAttributesW(PCredHandle phCredential, ULONG ulAttribute, void* pBuffer) { - SEC_WCHAR* Name; - SECURITY_STATUS status; - const SecurityFunctionTableW* table; + SEC_WCHAR* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableW* table = NULL; Name = (SEC_WCHAR*)sspi_SecureHandleGetUpperPointer(phCredential); if (!Name) @@ -1493,9 +1493,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_QueryCredentialsAttributesW(PCredHandle p static SECURITY_STATUS SEC_ENTRY winpr_QueryCredentialsAttributesA(PCredHandle phCredential, ULONG ulAttribute, void* pBuffer) { - char* Name; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + char* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (char*)sspi_SecureHandleGetUpperPointer(phCredential); if (!Name) @@ -1527,9 +1527,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_SetCredentialsAttributesW(PCredHandle phC ULONG ulAttribute, void* pBuffer, ULONG cbBuffer) { - SEC_WCHAR* Name; - SECURITY_STATUS status; - const SecurityFunctionTableW* table; + SEC_WCHAR* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableW* table = NULL; Name = (SEC_WCHAR*)sspi_SecureHandleGetUpperPointer(phCredential); if (!Name) @@ -1561,9 +1561,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_SetCredentialsAttributesA(PCredHandle phC ULONG ulAttribute, void* pBuffer, ULONG cbBuffer) { - char* Name; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + char* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (char*)sspi_SecureHandleGetUpperPointer(phCredential); if (!Name) @@ -1598,9 +1598,9 @@ winpr_AcceptSecurityContext(PCredHandle phCredential, PCtxtHandle phContext, PSe ULONG fContextReq, ULONG TargetDataRep, PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsTimeStamp) { - char* Name; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + char* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (char*)sspi_SecureHandleGetUpperPointer(phCredential); if (!Name) @@ -1634,8 +1634,8 @@ static SECURITY_STATUS SEC_ENTRY winpr_ApplyControlToken(PCtxtHandle phContext, PSecBufferDesc pInput) { char* Name = NULL; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (char*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -1667,8 +1667,8 @@ static SECURITY_STATUS SEC_ENTRY winpr_CompleteAuthToken(PCtxtHandle phContext, PSecBufferDesc pToken) { char* Name = NULL; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (char*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -1736,9 +1736,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_FreeContextBuffer(void* pvContextBuffer) static SECURITY_STATUS SEC_ENTRY winpr_ImpersonateSecurityContext(PCtxtHandle phContext) { - SEC_CHAR* Name; - SECURITY_STATUS status; - const SecurityFunctionTableW* table; + SEC_CHAR* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableW* table = NULL; Name = (SEC_CHAR*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -1771,9 +1771,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_InitializeSecurityContextW( ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsExpiry) { - SEC_CHAR* Name; - SECURITY_STATUS status; - const SecurityFunctionTableW* table; + SEC_CHAR* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableW* table = NULL; Name = (SEC_CHAR*)sspi_SecureHandleGetUpperPointer(phCredential); if (!Name) @@ -1808,9 +1808,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_InitializeSecurityContextA( ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsExpiry) { - SEC_CHAR* Name; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + SEC_CHAR* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (SEC_CHAR*)sspi_SecureHandleGetUpperPointer(phCredential); if (!Name) @@ -1843,9 +1843,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_InitializeSecurityContextA( static SECURITY_STATUS SEC_ENTRY winpr_QueryContextAttributesW(PCtxtHandle phContext, ULONG ulAttribute, void* pBuffer) { - SEC_CHAR* Name; - SECURITY_STATUS status; - const SecurityFunctionTableW* table; + SEC_CHAR* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableW* table = NULL; Name = (SEC_CHAR*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -1876,9 +1876,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_QueryContextAttributesW(PCtxtHandle phCon static SECURITY_STATUS SEC_ENTRY winpr_QueryContextAttributesA(PCtxtHandle phContext, ULONG ulAttribute, void* pBuffer) { - SEC_CHAR* Name; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + SEC_CHAR* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (SEC_CHAR*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -1909,9 +1909,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_QueryContextAttributesA(PCtxtHandle phCon static SECURITY_STATUS SEC_ENTRY winpr_QuerySecurityContextToken(PCtxtHandle phContext, HANDLE* phToken) { - SEC_CHAR* Name; - SECURITY_STATUS status; - const SecurityFunctionTableW* table; + SEC_CHAR* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableW* table = NULL; Name = (SEC_CHAR*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -1943,9 +1943,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_SetContextAttributesW(PCtxtHandle phConte ULONG ulAttribute, void* pBuffer, ULONG cbBuffer) { - SEC_CHAR* Name; - SECURITY_STATUS status; - const SecurityFunctionTableW* table; + SEC_CHAR* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableW* table = NULL; Name = (SEC_CHAR*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -1977,9 +1977,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_SetContextAttributesA(PCtxtHandle phConte ULONG ulAttribute, void* pBuffer, ULONG cbBuffer) { - char* Name; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + char* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (char*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -2009,9 +2009,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_SetContextAttributesA(PCtxtHandle phConte static SECURITY_STATUS SEC_ENTRY winpr_RevertSecurityContext(PCtxtHandle phContext) { - SEC_CHAR* Name; - SECURITY_STATUS status; - const SecurityFunctionTableW* table; + SEC_CHAR* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableW* table = NULL; Name = (SEC_CHAR*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -2045,9 +2045,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_DecryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { - char* Name; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + char* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (char*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -2078,9 +2078,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_DecryptMessage(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY winpr_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { - char* Name; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + char* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (char*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -2111,9 +2111,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_EncryptMessage(PCtxtHandle phContext, ULO static SECURITY_STATUS SEC_ENTRY winpr_MakeSignature(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { - char* Name; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + char* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (char*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) @@ -2145,9 +2145,9 @@ static SECURITY_STATUS SEC_ENTRY winpr_VerifySignature(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { - char* Name; - SECURITY_STATUS status; - const SecurityFunctionTableA* table; + char* Name = NULL; + SECURITY_STATUS status = 0; + const SecurityFunctionTableA* table = NULL; Name = (char*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) diff --git a/winpr/libwinpr/sspi/test/TestAcquireCredentialsHandle.c b/winpr/libwinpr/sspi/test/TestAcquireCredentialsHandle.c index e15577b18..05466c8c1 100644 --- a/winpr/libwinpr/sspi/test/TestAcquireCredentialsHandle.c +++ b/winpr/libwinpr/sspi/test/TestAcquireCredentialsHandle.c @@ -11,11 +11,11 @@ static const char* test_Password = "Password"; int TestAcquireCredentialsHandle(int argc, char* argv[]) { int rc = -1; - SECURITY_STATUS status; + SECURITY_STATUS status = 0; CredHandle credentials = { 0 }; TimeStamp expiration; SEC_WINNT_AUTH_IDENTITY identity; - SecurityFunctionTable* table; + SecurityFunctionTable* table = NULL; SecPkgCredentials_Names credential_names; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/sspi/test/TestEnumerateSecurityPackages.c b/winpr/libwinpr/sspi/test/TestEnumerateSecurityPackages.c index 606ad04a0..316403ba1 100644 --- a/winpr/libwinpr/sspi/test/TestEnumerateSecurityPackages.c +++ b/winpr/libwinpr/sspi/test/TestEnumerateSecurityPackages.c @@ -7,11 +7,11 @@ int TestEnumerateSecurityPackages(int argc, char* argv[]) { - int index; - ULONG cPackages; - SECURITY_STATUS status; - SecPkgInfo* pPackageInfo; - SecurityFunctionTable* table; + int index = 0; + ULONG cPackages = 0; + SECURITY_STATUS status = 0; + SecPkgInfo* pPackageInfo = NULL; + SecurityFunctionTable* table = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/sspi/test/TestInitializeSecurityContext.c b/winpr/libwinpr/sspi/test/TestInitializeSecurityContext.c index 7cf1b5007..88f5a7c19 100644 --- a/winpr/libwinpr/sspi/test/TestInitializeSecurityContext.c +++ b/winpr/libwinpr/sspi/test/TestInitializeSecurityContext.c @@ -11,18 +11,18 @@ static const char* test_Password = "Password"; int TestInitializeSecurityContext(int argc, char* argv[]) { int rc = -1; - UINT32 cbMaxLen; - UINT32 fContextReq; + UINT32 cbMaxLen = 0; + UINT32 fContextReq = 0; void* output_buffer = NULL; CtxtHandle context; - ULONG pfContextAttr; - SECURITY_STATUS status; + ULONG pfContextAttr = 0; + SECURITY_STATUS status = 0; CredHandle credentials = { 0 }; TimeStamp expiration; - PSecPkgInfo pPackageInfo; + PSecPkgInfo pPackageInfo = NULL; SEC_WINNT_AUTH_IDENTITY identity = { 0 }; - SecurityFunctionTable* table; - PSecBuffer p_SecBuffer; + SecurityFunctionTable* table = NULL; + PSecBuffer p_SecBuffer = NULL; SecBuffer output_SecBuffer; SecBufferDesc output_SecBuffer_desc; diff --git a/winpr/libwinpr/sspi/test/TestNTLM.c b/winpr/libwinpr/sspi/test/TestNTLM.c index b88dcea6f..2ab33731d 100644 --- a/winpr/libwinpr/sspi/test/TestNTLM.c +++ b/winpr/libwinpr/sspi/test/TestNTLM.c @@ -460,9 +460,9 @@ static void test_ntlm_server_free(TEST_NTLM_SERVER* ntlm) static BOOL test_default(void) { - int status; + int status = 0; BOOL rc = FALSE; - PSecBuffer pSecBuffer; + PSecBuffer pSecBuffer = NULL; TEST_NTLM_CLIENT* client = NULL; TEST_NTLM_SERVER* server = NULL; BOOL DynamicTest = TRUE; diff --git a/winpr/libwinpr/sspi/test/TestQuerySecurityPackageInfo.c b/winpr/libwinpr/sspi/test/TestQuerySecurityPackageInfo.c index 5bfaaeee3..5d1ca0079 100644 --- a/winpr/libwinpr/sspi/test/TestQuerySecurityPackageInfo.c +++ b/winpr/libwinpr/sspi/test/TestQuerySecurityPackageInfo.c @@ -6,10 +6,10 @@ int TestQuerySecurityPackageInfo(int argc, char* argv[]) { - int rc; - SECURITY_STATUS status; - SecPkgInfo* pPackageInfo; - SecurityFunctionTable* table; + int rc = 0; + SECURITY_STATUS status = 0; + SecPkgInfo* pPackageInfo = NULL; + SecurityFunctionTable* table = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/sspicli/sspicli.c b/winpr/libwinpr/sspicli/sspicli.c index 38a8d1d9a..4f206c86e 100644 --- a/winpr/libwinpr/sspicli/sspicli.c +++ b/winpr/libwinpr/sspicli/sspicli.c @@ -131,8 +131,8 @@ static HANDLE_OPS ops = { LogonUserIsHandled, BOOL LogonUserA(LPCSTR lpszUsername, LPCSTR lpszDomain, LPCSTR lpszPassword, DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken) { - struct passwd* pw; - WINPR_ACCESS_TOKEN* token; + struct passwd* pw = NULL; + WINPR_ACCESS_TOKEN* token = NULL; if (!lpszUsername) return FALSE; @@ -206,7 +206,7 @@ BOOL GetUserNameExA(EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG case NameSamCompatible: #if defined(WINPR_HAVE_GETPWUID_R) { - int rc; + int rc = 0; struct passwd pwd = { 0 }; struct passwd* result = NULL; uid_t uid = getuid(); @@ -251,7 +251,7 @@ BOOL GetUserNameExA(EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG BOOL GetUserNameExW(EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG nSize) { BOOL rc = FALSE; - char* name; + char* name = NULL; WINPR_ASSERT(nSize); WINPR_ASSERT(lpNameBuffer); diff --git a/winpr/libwinpr/synch/barrier.c b/winpr/libwinpr/synch/barrier.c index 9d54f2441..ee3b84a95 100644 --- a/winpr/libwinpr/synch/barrier.c +++ b/winpr/libwinpr/synch/barrier.c @@ -92,8 +92,8 @@ BOOL WINAPI winpr_InitializeSynchronizationBarrier(LPSYNCHRONIZATION_BARRIER lpB LONG lTotalThreads, LONG lSpinCount) { SYSTEM_INFO sysinfo; - HANDLE hEvent0; - HANDLE hEvent1; + HANDLE hEvent0 = NULL; + HANDLE hEvent1 = NULL; #ifdef _WIN32 InitOnceExecuteOnce(&g_InitOnce, InitOnce_Barrier, NULL, NULL); @@ -138,9 +138,9 @@ BOOL WINAPI winpr_InitializeSynchronizationBarrier(LPSYNCHRONIZATION_BARRIER lpB BOOL WINAPI winpr_EnterSynchronizationBarrier(LPSYNCHRONIZATION_BARRIER lpBarrier, DWORD dwFlags) { - LONG remainingThreads; - HANDLE hCurrentEvent; - HANDLE hDormantEvent; + LONG remainingThreads = 0; + HANDLE hCurrentEvent = NULL; + HANDLE hDormantEvent = NULL; #ifdef _WIN32 if (g_NativeBarrier) diff --git a/winpr/libwinpr/synch/event.c b/winpr/libwinpr/synch/event.c index f60113951..12c42389c 100644 --- a/winpr/libwinpr/synch/event.c +++ b/winpr/libwinpr/synch/event.c @@ -54,9 +54,9 @@ static wArrayList* global_event_list = NULL; static void dump_event(WINPR_EVENT* event, size_t index) { - char** msg; - size_t used; - size_t i; + char** msg = NULL; + size_t used = 0; + size_t i = 0; #if 0 void* stack = winpr_backtrace(20); WLog_DBG(TAG, "Called from:"); @@ -138,7 +138,7 @@ void winpr_event_init_from_fd(WINPR_EVENT_IMPL* event, int fd) BOOL winpr_event_set(WINPR_EVENT_IMPL* event) { - int ret; + int ret = 0; do { #ifdef WINPR_HAVE_SYS_EVENTFD_H @@ -154,7 +154,7 @@ BOOL winpr_event_set(WINPR_EVENT_IMPL* event) BOOL winpr_event_reset(WINPR_EVENT_IMPL* event) { - int ret; + int ret = 0; do { do @@ -270,7 +270,7 @@ static HANDLE_OPS ops = { EventIsHandled, HANDLE CreateEventW(LPSECURITY_ATTRIBUTES lpEventAttributes, BOOL bManualReset, BOOL bInitialState, LPCWSTR lpName) { - HANDLE handle; + HANDLE handle = NULL; char* name = NULL; if (lpName) @@ -392,9 +392,9 @@ HANDLE OpenEventA(DWORD dwDesiredAccess, BOOL bInheritHandle, LPCSTR lpName) BOOL SetEvent(HANDLE hEvent) { - ULONG Type; - WINPR_HANDLE* Object; - WINPR_EVENT* event; + ULONG Type = 0; + WINPR_HANDLE* Object = NULL; + WINPR_EVENT* event = NULL; if (!winpr_Handle_GetInfo(hEvent, &Type, &Object) || Type != HANDLE_TYPE_EVENT) { @@ -409,9 +409,9 @@ BOOL SetEvent(HANDLE hEvent) BOOL ResetEvent(HANDLE hEvent) { - ULONG Type; - WINPR_HANDLE* Object; - WINPR_EVENT* event; + ULONG Type = 0; + WINPR_HANDLE* Object = NULL; + WINPR_EVENT* event = NULL; if (!winpr_Handle_GetInfo(hEvent, &Type, &Object) || Type != HANDLE_TYPE_EVENT) { @@ -430,7 +430,7 @@ HANDLE CreateFileDescriptorEventW(LPSECURITY_ATTRIBUTES lpEventAttributes, BOOL BOOL bInitialState, int FileDescriptor, ULONG mode) { #ifndef _WIN32 - WINPR_EVENT* event; + WINPR_EVENT* event = NULL; HANDLE handle = NULL; event = (WINPR_EVENT*)calloc(1, sizeof(WINPR_EVENT)); @@ -498,9 +498,9 @@ int GetEventFileDescriptor(HANDLE hEvent) int SetEventFileDescriptor(HANDLE hEvent, int FileDescriptor, ULONG mode) { #ifndef _WIN32 - ULONG Type; - WINPR_HANDLE* Object; - WINPR_EVENT* event; + ULONG Type = 0; + WINPR_HANDLE* Object = NULL; + WINPR_EVENT* event = NULL; if (!winpr_Handle_GetInfo(hEvent, &Type, &Object) || Type != HANDLE_TYPE_EVENT) { @@ -536,8 +536,8 @@ int SetEventFileDescriptor(HANDLE hEvent, int FileDescriptor, ULONG mode) void* GetEventWaitObject(HANDLE hEvent) { #ifndef _WIN32 - int fd; - void* obj; + int fd = 0; + void* obj = NULL; fd = GetEventFileDescriptor(hEvent); obj = ((void*)(long)fd); return obj; @@ -564,7 +564,7 @@ void DumpEventHandles_(const char* fkt, const char* file, size_t line) int rc = getrlimit(RLIMIT_NOFILE, &r); if (rc >= 0) { - rlim_t x; + rlim_t x = 0; size_t count = 0; for (x = 0; x < r.rlim_cur; x++) { diff --git a/winpr/libwinpr/synch/mutex.c b/winpr/libwinpr/synch/mutex.c index 2a912028b..7db58c26d 100644 --- a/winpr/libwinpr/synch/mutex.c +++ b/winpr/libwinpr/synch/mutex.c @@ -57,7 +57,7 @@ static int MutexGetFd(HANDLE handle) BOOL MutexCloseHandle(HANDLE handle) { WINPR_MUTEX* mutex = (WINPR_MUTEX*)handle; - int rc; + int rc = 0; if (!MutexIsHandled(handle)) return FALSE; @@ -70,7 +70,7 @@ BOOL MutexCloseHandle(HANDLE handle) #if defined(WITH_DEBUG_MUTEX) { size_t used = 0; - size_t i; + size_t i = 0; void* stack = winpr_backtrace(20); char** msg = NULL; @@ -122,7 +122,7 @@ static HANDLE_OPS ops = { MutexIsHandled, HANDLE CreateMutexW(LPSECURITY_ATTRIBUTES lpMutexAttributes, BOOL bInitialOwner, LPCWSTR lpName) { - HANDLE handle; + HANDLE handle = NULL; char* name = NULL; if (lpName) @@ -140,7 +140,7 @@ HANDLE CreateMutexW(LPSECURITY_ATTRIBUTES lpMutexAttributes, BOOL bInitialOwner, HANDLE CreateMutexA(LPSECURITY_ATTRIBUTES lpMutexAttributes, BOOL bInitialOwner, LPCSTR lpName) { HANDLE handle = NULL; - WINPR_MUTEX* mutex; + WINPR_MUTEX* mutex = NULL; mutex = (WINPR_MUTEX*)calloc(1, sizeof(WINPR_MUTEX)); if (lpMutexAttributes) @@ -220,8 +220,8 @@ HANDLE OpenMutexW(DWORD dwDesiredAccess, BOOL bInheritHandle, LPCWSTR lpName) BOOL ReleaseMutex(HANDLE hMutex) { - ULONG Type; - WINPR_HANDLE* Object; + ULONG Type = 0; + WINPR_HANDLE* Object = NULL; if (!winpr_Handle_GetInfo(hMutex, &Type, &Object)) return FALSE; diff --git a/winpr/libwinpr/synch/pollset.c b/winpr/libwinpr/synch/pollset.c index f08746a51..8711ea080 100644 --- a/winpr/libwinpr/synch/pollset.c +++ b/winpr/libwinpr/synch/pollset.c @@ -85,7 +85,7 @@ BOOL pollset_add(WINPR_POLL_SET* set, int fd, ULONG mode) { WINPR_ASSERT(set); #ifdef WINPR_HAVE_POLL_H - struct pollfd* item; + struct pollfd* item = NULL; if (set->fillIndex == set->size) return FALSE; @@ -121,8 +121,8 @@ int pollset_poll(WINPR_POLL_SET* set, DWORD dwMilliseconds) { WINPR_ASSERT(set); int ret = 0; - UINT64 dueTime; - UINT64 now; + UINT64 dueTime = 0; + UINT64 now = 0; now = GetTickCount64(); if (dwMilliseconds == INFINITE) @@ -131,7 +131,7 @@ int pollset_poll(WINPR_POLL_SET* set, DWORD dwMilliseconds) dueTime = now + dwMilliseconds; #ifdef WINPR_HAVE_POLL_H - int timeout; + int timeout = 0; do { diff --git a/winpr/libwinpr/synch/semaphore.c b/winpr/libwinpr/synch/semaphore.c index 0be372430..855675b03 100644 --- a/winpr/libwinpr/synch/semaphore.c +++ b/winpr/libwinpr/synch/semaphore.c @@ -53,7 +53,7 @@ static int SemaphoreGetFd(HANDLE handle) static DWORD SemaphoreCleanupHandle(HANDLE handle) { - SSIZE_T length; + SSIZE_T length = 0; WINPR_SEMAPHORE* sem = (WINPR_SEMAPHORE*)handle; if (!SemaphoreIsHandled(handle)) @@ -129,8 +129,8 @@ static HANDLE_OPS ops = { SemaphoreIsHandled, HANDLE CreateSemaphoreW(LPSECURITY_ATTRIBUTES lpSemaphoreAttributes, LONG lInitialCount, LONG lMaximumCount, LPCWSTR lpName) { - HANDLE handle; - WINPR_SEMAPHORE* semaphore; + HANDLE handle = NULL; + WINPR_SEMAPHORE* semaphore = NULL; semaphore = (WINPR_SEMAPHORE*)calloc(1, sizeof(WINPR_SEMAPHORE)); if (!semaphore) @@ -212,9 +212,9 @@ HANDLE OpenSemaphoreA(DWORD dwDesiredAccess, BOOL bInheritHandle, LPCSTR lpName) BOOL ReleaseSemaphore(HANDLE hSemaphore, LONG lReleaseCount, LPLONG lpPreviousCount) { - ULONG Type; - WINPR_HANDLE* Object; - WINPR_SEMAPHORE* semaphore; + ULONG Type = 0; + WINPR_HANDLE* Object = NULL; + WINPR_SEMAPHORE* semaphore = NULL; if (!winpr_Handle_GetInfo(hSemaphore, &Type, &Object)) return FALSE; diff --git a/winpr/libwinpr/synch/sleep.c b/winpr/libwinpr/synch/sleep.c index 3c19a6598..be2f4c684 100644 --- a/winpr/libwinpr/synch/sleep.c +++ b/winpr/libwinpr/synch/sleep.c @@ -56,9 +56,9 @@ DWORD SleepEx(DWORD dwMilliseconds, BOOL bAlertable) { WINPR_THREAD* thread = winpr_GetCurrentThread(); WINPR_POLL_SET pollset; - int status; + int status = 0; DWORD ret = WAIT_FAILED; - BOOL autoSignalled; + BOOL autoSignalled = 0; if (thread) { diff --git a/winpr/libwinpr/synch/test/TestSynchBarrier.c b/winpr/libwinpr/synch/test/TestSynchBarrier.c index 9d4c6a86e..f4c33331f 100644 --- a/winpr/libwinpr/synch/test/TestSynchBarrier.c +++ b/winpr/libwinpr/synch/test/TestSynchBarrier.c @@ -26,7 +26,7 @@ static DWORD WINAPI test_synch_barrier_thread(LPVOID lpParam) { BOOL status = FALSE; struct test_params* p = (struct test_params*)lpParam; - DWORD i; + DWORD i = 0; InterlockedIncrement(&p->threadCount); @@ -61,12 +61,12 @@ out: static BOOL TestSynchBarrierWithFlags(DWORD dwFlags, DWORD dwThreads, DWORD dwLoops) { - HANDLE* threads; + HANDLE* threads = NULL; struct test_params p; - DWORD dwStatus; - DWORD expectedTrueCount; - DWORD expectedFalseCount; - DWORD i; + DWORD dwStatus = 0; + DWORD expectedTrueCount = 0; + DWORD expectedFalseCount = 0; + DWORD i = 0; p.threadCount = 0; p.trueCount = 0; p.falseCount = 0; @@ -180,8 +180,8 @@ static BOOL TestSynchBarrierWithFlags(DWORD dwFlags, DWORD dwThreads, DWORD dwLo int TestSynchBarrier(int argc, char* argv[]) { SYSTEM_INFO sysinfo; - DWORD dwMaxThreads; - DWORD dwMinThreads; + DWORD dwMaxThreads = 0; + DWORD dwMinThreads = 0; DWORD dwNumLoops = 10; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/synch/test/TestSynchCritical.c b/winpr/libwinpr/synch/test/TestSynchCritical.c index 0ed5de315..670b33712 100644 --- a/winpr/libwinpr/synch/test/TestSynchCritical.c +++ b/winpr/libwinpr/synch/test/TestSynchCritical.c @@ -44,9 +44,9 @@ static BOOL TestSynchCritical_TriggerAndCheckRaceCondition(HANDLE OwningThread, * FALSE */ static DWORD WINAPI TestSynchCritical_Test1(LPVOID arg) { - int i; - int j; - int rc; + int i = 0; + int j = 0; + int rc = 0; HANDLE hThread = (HANDLE)(ULONG_PTR)GetCurrentThreadId(); PBOOL pbContinueRunning = (PBOOL)arg; @@ -99,18 +99,18 @@ static DWORD WINAPI TestSynchCritical_Test2(LPVOID arg) static DWORD WINAPI TestSynchCritical_Main(LPVOID arg) { - int i; - int j; + int i = 0; + int j = 0; SYSTEM_INFO sysinfo; - DWORD dwPreviousSpinCount; - DWORD dwSpinCount; - DWORD dwSpinCountExpected; - HANDLE hMainThread; - HANDLE* hThreads; - HANDLE hThread; - DWORD dwThreadCount; - DWORD dwThreadExitCode; - BOOL bTest1Running; + DWORD dwPreviousSpinCount = 0; + DWORD dwSpinCount = 0; + DWORD dwSpinCountExpected = 0; + HANDLE hMainThread = NULL; + HANDLE* hThreads = NULL; + HANDLE hThread = NULL; + DWORD dwThreadCount = 0; + DWORD dwThreadExitCode = 0; + BOOL bTest1Running = 0; PBOOL pbThreadTerminated = (PBOOL)arg; @@ -314,10 +314,10 @@ fail: int TestSynchCritical(int argc, char* argv[]) { BOOL bThreadTerminated = FALSE; - HANDLE hThread; - DWORD dwThreadExitCode; - DWORD dwDeadLockDetectionTimeMs; - DWORD i; + HANDLE hThread = NULL; + DWORD dwThreadExitCode = 0; + DWORD dwDeadLockDetectionTimeMs = 0; + DWORD i = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/synch/test/TestSynchEvent.c b/winpr/libwinpr/synch/test/TestSynchEvent.c index dd7c65853..1c6a670e2 100644 --- a/winpr/libwinpr/synch/test/TestSynchEvent.c +++ b/winpr/libwinpr/synch/test/TestSynchEvent.c @@ -4,8 +4,8 @@ int TestSynchEvent(int argc, char* argv[]) { - HANDLE event; - int i; + HANDLE event = NULL; + int i = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); if (ResetEvent(NULL)) diff --git a/winpr/libwinpr/synch/test/TestSynchInit.c b/winpr/libwinpr/synch/test/TestSynchInit.c index 8f460ae51..5230a9f36 100644 --- a/winpr/libwinpr/synch/test/TestSynchInit.c +++ b/winpr/libwinpr/synch/test/TestSynchInit.c @@ -42,8 +42,8 @@ static BOOL CALLBACK TestOnceFunction(PINIT_ONCE once, PVOID param, PVOID* conte static DWORD WINAPI TestThreadFunction(LPVOID lpParam) { - LONG calls; - BOOL ok; + LONG calls = 0; + BOOL ok = 0; WINPR_UNUSED(lpParam); @@ -69,7 +69,7 @@ int TestSynchInit(int argc, char* argv[]) { HANDLE hThreads[TEST_NUM_THREADS]; DWORD dwCreatedThreads = 0; - DWORD i; + DWORD i = 0; BOOL result = FALSE; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/synch/test/TestSynchMutex.c b/winpr/libwinpr/synch/test/TestSynchMutex.c index 35d0b3fd2..7255d5dc4 100644 --- a/winpr/libwinpr/synch/test/TestSynchMutex.c +++ b/winpr/libwinpr/synch/test/TestSynchMutex.c @@ -5,8 +5,8 @@ static BOOL test_mutex_basic(void) { - HANDLE mutex; - DWORD rc; + HANDLE mutex = NULL; + DWORD rc = 0; if (!(mutex = CreateMutex(NULL, FALSE, NULL))) { @@ -45,9 +45,9 @@ static BOOL test_mutex_basic(void) static BOOL test_mutex_recursive(void) { - HANDLE mutex; - DWORD rc; - DWORD i; + HANDLE mutex = NULL; + DWORD rc = 0; + DWORD i = 0; DWORD cnt = 50; if (!(mutex = CreateMutex(NULL, TRUE, NULL))) diff --git a/winpr/libwinpr/synch/test/TestSynchSemaphore.c b/winpr/libwinpr/synch/test/TestSynchSemaphore.c index 8c7db3495..d44446aac 100644 --- a/winpr/libwinpr/synch/test/TestSynchSemaphore.c +++ b/winpr/libwinpr/synch/test/TestSynchSemaphore.c @@ -4,7 +4,7 @@ int TestSynchSemaphore(int argc, char* argv[]) { - HANDLE semaphore; + HANDLE semaphore = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); semaphore = CreateSemaphore(NULL, 0, 1, NULL); diff --git a/winpr/libwinpr/synch/test/TestSynchThread.c b/winpr/libwinpr/synch/test/TestSynchThread.c index 6e0cf3c34..3ba1edd82 100644 --- a/winpr/libwinpr/synch/test/TestSynchThread.c +++ b/winpr/libwinpr/synch/test/TestSynchThread.c @@ -13,9 +13,9 @@ static DWORD WINAPI test_thread(LPVOID arg) int TestSynchThread(int argc, char* argv[]) { - DWORD rc; - HANDLE thread; - int i; + DWORD rc = 0; + HANDLE thread = NULL; + int i = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/synch/test/TestSynchTimerQueue.c b/winpr/libwinpr/synch/test/TestSynchTimerQueue.c index 5cf0d434a..1e513facf 100644 --- a/winpr/libwinpr/synch/test/TestSynchTimerQueue.c +++ b/winpr/libwinpr/synch/test/TestSynchTimerQueue.c @@ -21,9 +21,9 @@ typedef struct apc_data APC_DATA; static VOID CALLBACK TimerRoutine(PVOID lpParam, BOOLEAN TimerOrWaitFired) { - UINT32 TimerTime; - APC_DATA* apcData; - UINT32 expectedTime; + UINT32 TimerTime = 0; + APC_DATA* apcData = NULL; + UINT32 expectedTime = 0; UINT32 CurrentTime = GetTickCount(); WINPR_UNUSED(TimerOrWaitFired); @@ -52,8 +52,8 @@ static VOID CALLBACK TimerRoutine(PVOID lpParam, BOOLEAN TimerOrWaitFired) int TestSynchTimerQueue(int argc, char* argv[]) { - DWORD index; - HANDLE hTimerQueue; + DWORD index = 0; + HANDLE hTimerQueue = NULL; HANDLE hTimers[TIMER_COUNT]; APC_DATA apcData[TIMER_COUNT]; diff --git a/winpr/libwinpr/synch/test/TestSynchWaitableTimer.c b/winpr/libwinpr/synch/test/TestSynchWaitableTimer.c index fac95b92a..f61bbc141 100644 --- a/winpr/libwinpr/synch/test/TestSynchWaitableTimer.c +++ b/winpr/libwinpr/synch/test/TestSynchWaitableTimer.c @@ -4,9 +4,9 @@ int TestSynchWaitableTimer(int argc, char* argv[]) { - DWORD status; - HANDLE timer; - LONG period; + DWORD status = 0; + HANDLE timer = NULL; + LONG period = 0; LARGE_INTEGER due; int result = -1; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/synch/test/TestSynchWaitableTimerAPC.c b/winpr/libwinpr/synch/test/TestSynchWaitableTimerAPC.c index 3ed592906..cf1f677dd 100644 --- a/winpr/libwinpr/synch/test/TestSynchWaitableTimerAPC.c +++ b/winpr/libwinpr/synch/test/TestSynchWaitableTimerAPC.c @@ -14,7 +14,7 @@ typedef struct apc_data APC_DATA; static VOID CALLBACK TimerAPCProc(LPVOID lpArg, DWORD dwTimerLowValue, DWORD dwTimerHighValue) { - APC_DATA* apcData; + APC_DATA* apcData = NULL; UINT32 CurrentTime = GetTickCount(); WINPR_UNUSED(dwTimerLowValue); WINPR_UNUSED(dwTimerHighValue); @@ -35,9 +35,9 @@ static VOID CALLBACK TimerAPCProc(LPVOID lpArg, DWORD dwTimerLowValue, DWORD dwT int TestSynchWaitableTimerAPC(int argc, char* argv[]) { int status = -1; - DWORD rc; + DWORD rc = 0; HANDLE hTimer = NULL; - BOOL bSuccess; + BOOL bSuccess = 0; LARGE_INTEGER due; APC_DATA apcData = { 0 }; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/synch/timer.c b/winpr/libwinpr/synch/timer.c index dd1876b05..8238a88e7 100644 --- a/winpr/libwinpr/synch/timer.c +++ b/winpr/libwinpr/synch/timer.c @@ -64,8 +64,8 @@ static int TimerGetFd(HANDLE handle) static DWORD TimerCleanupHandle(HANDLE handle) { - SSIZE_T length; - UINT64 expirations; + SSIZE_T length = 0; + UINT64 expirations = 0; WINPR_TIMER* timer = (WINPR_TIMER*)handle; if (!TimerIsHandled(handle)) @@ -133,7 +133,7 @@ static void TimerPostDelete_APC(LPVOID arg) BOOL TimerCloseHandle(HANDLE handle) { - WINPR_TIMER* timer; + WINPR_TIMER* timer = NULL; timer = (WINPR_TIMER*)handle; if (!TimerIsHandled(handle)) @@ -160,8 +160,8 @@ BOOL TimerCloseHandle(HANDLE handle) free(timer->name); if (timer->apcItem.linked) { - TimerDeleter* deleter; - WINPR_APC_ITEM* apcItem; + TimerDeleter* deleter = NULL; + WINPR_APC_ITEM* apcItem = NULL; switch (apc_remove(&timer->apcItem)) { @@ -282,8 +282,8 @@ static int InitializeWaitableTimer(WINPR_TIMER* timer) static BOOL timer_drain_fd(int fd) { - UINT64 expr; - SSIZE_T ret; + UINT64 expr = 0; + SSIZE_T ret = 0; do { @@ -323,7 +323,7 @@ HANDLE CreateWaitableTimerA(LPSECURITY_ATTRIBUTES lpTimerAttributes, BOOL bManua LPCSTR lpTimerName) { HANDLE handle = NULL; - WINPR_TIMER* timer; + WINPR_TIMER* timer = NULL; if (lpTimerAttributes) WLog_WARN(TAG, "[%s] does not support lpTimerAttributes", lpTimerName); @@ -379,7 +379,7 @@ fail: HANDLE CreateWaitableTimerW(LPSECURITY_ATTRIBUTES lpTimerAttributes, BOOL bManualReset, LPCWSTR lpTimerName) { - HANDLE handle; + HANDLE handle = NULL; LPSTR name = NULL; if (lpTimerName) @@ -409,7 +409,7 @@ HANDLE CreateWaitableTimerExA(LPSECURITY_ATTRIBUTES lpTimerAttributes, LPCSTR lp HANDLE CreateWaitableTimerExW(LPSECURITY_ATTRIBUTES lpTimerAttributes, LPCWSTR lpTimerName, DWORD dwFlags, DWORD dwDesiredAccess) { - HANDLE handle; + HANDLE handle = NULL; LPSTR name = NULL; if (lpTimerName) @@ -458,9 +458,9 @@ BOOL SetWaitableTimer(HANDLE hTimer, const LARGE_INTEGER* lpDueTime, LONG lPerio PTIMERAPCROUTINE pfnCompletionRoutine, LPVOID lpArgToCompletionRoutine, BOOL fResume) { - ULONG Type; - WINPR_HANDLE* Object; - WINPR_TIMER* timer; + ULONG Type = 0; + WINPR_HANDLE* Object = NULL; + WINPR_TIMER* timer = NULL; LONGLONG seconds = 0; LONGLONG nanoseconds = 0; int status = 0; @@ -642,8 +642,8 @@ HANDLE OpenWaitableTimerW(DWORD dwDesiredAccess, BOOL bInheritHandle, LPCWSTR lp BOOL CancelWaitableTimer(HANDLE hTimer) { - ULONG Type; - WINPR_HANDLE* Object; + ULONG Type = 0; + WINPR_HANDLE* Object = NULL; if (!winpr_Handle_GetInfo(hTimer, &Type, &Object)) return FALSE; @@ -671,8 +671,8 @@ BOOL CancelWaitableTimer(HANDLE hTimer) int GetTimerFileDescriptor(HANDLE hTimer) { #ifndef _WIN32 - WINPR_HANDLE* hdl; - ULONG type; + WINPR_HANDLE* hdl = NULL; + ULONG type = 0; if (!winpr_Handle_GetInfo(hTimer, &type, &hdl) || type != HANDLE_TYPE_TIMER) { @@ -698,7 +698,7 @@ int GetTimerFileDescriptor(HANDLE hTimer) static void timespec_add_ms(struct timespec* tspec, UINT32 ms) { - INT64 ns; + INT64 ns = 0; WINPR_ASSERT(tspec); ns = tspec->tv_nsec + (ms * 1000000LL); tspec->tv_sec += (ns / 1000000000LL); @@ -734,7 +734,7 @@ static void timespec_copy(struct timespec* dst, struct timespec* src) static void InsertTimerQueueTimer(WINPR_TIMER_QUEUE_TIMER** pHead, WINPR_TIMER_QUEUE_TIMER* timer) { - WINPR_TIMER_QUEUE_TIMER* node; + WINPR_TIMER_QUEUE_TIMER* node = NULL; WINPR_ASSERT(pHead); WINPR_ASSERT(timer); @@ -774,8 +774,8 @@ static void InsertTimerQueueTimer(WINPR_TIMER_QUEUE_TIMER** pHead, WINPR_TIMER_Q static void RemoveTimerQueueTimer(WINPR_TIMER_QUEUE_TIMER** pHead, WINPR_TIMER_QUEUE_TIMER* timer) { BOOL found = FALSE; - WINPR_TIMER_QUEUE_TIMER* node; - WINPR_TIMER_QUEUE_TIMER* prevNode; + WINPR_TIMER_QUEUE_TIMER* node = NULL; + WINPR_TIMER_QUEUE_TIMER* prevNode = NULL; WINPR_ASSERT(pHead); WINPR_ASSERT(timer); @@ -815,7 +815,7 @@ static void RemoveTimerQueueTimer(WINPR_TIMER_QUEUE_TIMER** pHead, WINPR_TIMER_Q static int FireExpiredTimerQueueTimers(WINPR_TIMER_QUEUE* timerQueue) { struct timespec CurrentTime; - WINPR_TIMER_QUEUE_TIMER* node; + WINPR_TIMER_QUEUE_TIMER* node = NULL; WINPR_ASSERT(timerQueue); @@ -857,7 +857,7 @@ static int FireExpiredTimerQueueTimers(WINPR_TIMER_QUEUE* timerQueue) static void* TimerQueueThread(void* arg) { - int status; + int status = 0; struct timespec timeout; WINPR_TIMER_QUEUE* timerQueue = (WINPR_TIMER_QUEUE*)arg; @@ -910,7 +910,7 @@ static int StartTimerQueueThread(WINPR_TIMER_QUEUE* timerQueue) HANDLE CreateTimerQueue(void) { HANDLE handle = NULL; - WINPR_TIMER_QUEUE* timerQueue; + WINPR_TIMER_QUEUE* timerQueue = NULL; timerQueue = (WINPR_TIMER_QUEUE*)calloc(1, sizeof(WINPR_TIMER_QUEUE)); if (timerQueue) @@ -928,10 +928,10 @@ HANDLE CreateTimerQueue(void) BOOL DeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) { - void* rvalue; - WINPR_TIMER_QUEUE* timerQueue; - WINPR_TIMER_QUEUE_TIMER* node; - WINPR_TIMER_QUEUE_TIMER* nextNode; + void* rvalue = NULL; + WINPR_TIMER_QUEUE* timerQueue = NULL; + WINPR_TIMER_QUEUE_TIMER* node = NULL; + WINPR_TIMER_QUEUE_TIMER* nextNode = NULL; if (!TimerQueue) return FALSE; @@ -998,8 +998,8 @@ BOOL CreateTimerQueueTimer(PHANDLE phNewTimer, HANDLE TimerQueue, WAITORTIMERCAL PVOID Parameter, DWORD DueTime, DWORD Period, ULONG Flags) { struct timespec CurrentTime; - WINPR_TIMER_QUEUE* timerQueue; - WINPR_TIMER_QUEUE_TIMER* timer; + WINPR_TIMER_QUEUE* timerQueue = NULL; + WINPR_TIMER_QUEUE_TIMER* timer = NULL; if (!TimerQueue) return FALSE; @@ -1034,8 +1034,8 @@ BOOL CreateTimerQueueTimer(PHANDLE phNewTimer, HANDLE TimerQueue, WAITORTIMERCAL BOOL ChangeTimerQueueTimer(HANDLE TimerQueue, HANDLE Timer, ULONG DueTime, ULONG Period) { struct timespec CurrentTime; - WINPR_TIMER_QUEUE* timerQueue; - WINPR_TIMER_QUEUE_TIMER* timer; + WINPR_TIMER_QUEUE* timerQueue = NULL; + WINPR_TIMER_QUEUE_TIMER* timer = NULL; if (!TimerQueue || !Timer) return FALSE; @@ -1060,8 +1060,8 @@ BOOL ChangeTimerQueueTimer(HANDLE TimerQueue, HANDLE Timer, ULONG DueTime, ULONG BOOL DeleteTimerQueueTimer(HANDLE TimerQueue, HANDLE Timer, HANDLE CompletionEvent) { - WINPR_TIMER_QUEUE* timerQueue; - WINPR_TIMER_QUEUE_TIMER* timer; + WINPR_TIMER_QUEUE* timerQueue = NULL; + WINPR_TIMER_QUEUE_TIMER* timer = NULL; if (!TimerQueue || !Timer) return FALSE; diff --git a/winpr/libwinpr/synch/wait.c b/winpr/libwinpr/synch/wait.c index 4b0a535ff..561a62325 100644 --- a/winpr/libwinpr/synch/wait.c +++ b/winpr/libwinpr/synch/wait.c @@ -459,7 +459,7 @@ DWORD WaitForMultipleObjectsEx(DWORD nCount, const HANDLE* lpHandles, BOOL bWait status = 0; if (!autoSignaled) { - DWORD waitTime; + DWORD waitTime = 0; if (dwMilliseconds == INFINITE) waitTime = INFINITE; diff --git a/winpr/libwinpr/sysinfo/sysinfo.c b/winpr/libwinpr/sysinfo/sysinfo.c index a1783cc3a..f12f4eb9b 100644 --- a/winpr/libwinpr/sysinfo/sysinfo.c +++ b/winpr/libwinpr/sysinfo/sysinfo.c @@ -393,7 +393,7 @@ BOOL GetVersionExW(LPOSVERSIONINFOW lpVersionInformation) BOOL GetComputerNameW(LPWSTR lpBuffer, LPDWORD lpnSize) { - BOOL rc; + BOOL rc = 0; LPSTR buffer = NULL; if (!lpnSize || (*lpnSize > INT_MAX)) return FALSE; @@ -419,8 +419,8 @@ BOOL GetComputerNameW(LPWSTR lpBuffer, LPDWORD lpnSize) BOOL GetComputerNameA(LPSTR lpBuffer, LPDWORD lpnSize) { - char* dot; - size_t length; + char* dot = NULL; + size_t length = 0; char hostname[256] = { 0 }; if (!lpnSize) @@ -453,7 +453,7 @@ BOOL GetComputerNameA(LPSTR lpBuffer, LPDWORD lpnSize) BOOL GetComputerNameExA(COMPUTER_NAME_FORMAT NameType, LPSTR lpBuffer, LPDWORD lpnSize) { - size_t length; + size_t length = 0; char hostname[256] = { 0 }; if (!lpnSize) @@ -509,7 +509,7 @@ BOOL GetComputerNameExA(COMPUTER_NAME_FORMAT NameType, LPSTR lpBuffer, LPDWORD l BOOL GetComputerNameExW(COMPUTER_NAME_FORMAT NameType, LPWSTR lpBuffer, LPDWORD lpnSize) { - BOOL rc; + BOOL rc = 0; LPSTR lpABuffer = NULL; if (!lpnSize) @@ -817,10 +817,10 @@ BOOL IsProcessorFeaturePresent(DWORD ProcessorFeature) #endif // __linux__ #elif defined(_M_IX86_AMD64) #ifdef __GNUC__ - unsigned a; - unsigned b; - unsigned c; - unsigned d; + unsigned a = 0; + unsigned b = 0; + unsigned c = 0; + unsigned d = 0; cpuid(1, &a, &b, &c, &d); switch (ProcessorFeature) @@ -948,20 +948,20 @@ BOOL IsProcessorFeaturePresentEx(DWORD ProcessorFeature) #endif // __linux__ #elif defined(_M_IX86_AMD64) - unsigned a; - unsigned b; - unsigned c; - unsigned d; + unsigned a = 0; + unsigned b = 0; + unsigned c = 0; + unsigned d = 0; cpuid(1, &a, &b, &c, &d); switch (ProcessorFeature) { case PF_EX_LZCNT: { - unsigned a81; - unsigned b81; - unsigned c81; - unsigned d81; + unsigned a81 = 0; + unsigned b81 = 0; + unsigned c81 = 0; + unsigned d81 = 0; cpuid(0x80000001, &a81, &b81, &c81, &d81); if (c81 & C81_BIT_LZCNT) @@ -1009,8 +1009,8 @@ BOOL IsProcessorFeaturePresentEx(DWORD ProcessorFeature) if (!(c & C_BIT_XGETBV)) break; - int e; - int f; + int e = 0; + int f = 0; xgetbv(0, e, f); /* XGETBV enabled for applications and XMM/YMM states enabled */ diff --git a/winpr/libwinpr/sysinfo/test/TestGetComputerName.c b/winpr/libwinpr/sysinfo/test/TestGetComputerName.c index f06131e0e..444405637 100644 --- a/winpr/libwinpr/sysinfo/test/TestGetComputerName.c +++ b/winpr/libwinpr/sysinfo/test/TestGetComputerName.c @@ -27,9 +27,9 @@ static BOOL Test_GetComputerName(void) CHAR netbiosName1[MAX_COMPUTERNAME_LENGTH + 1]; CHAR netbiosName2[MAX_COMPUTERNAME_LENGTH + 1]; const DWORD netbiosBufferSize = sizeof(netbiosName1) / sizeof(CHAR); - DWORD dwSize; - DWORD dwNameLength; - DWORD dwError; + DWORD dwSize = 0; + DWORD dwNameLength = 0; + DWORD dwError = 0; memset(netbiosName1, 0xAA, netbiosBufferSize); memset(netbiosName2, 0xBB, netbiosBufferSize); @@ -190,10 +190,10 @@ static BOOL Test_GetComputerNameEx_Format(COMPUTER_NAME_FORMAT format) CHAR computerName2[255 + 1]; const DWORD nameBufferSize = sizeof(computerName1) / sizeof(CHAR); - DWORD dwSize; - DWORD dwMinSize; - DWORD dwNameLength; - DWORD dwError; + DWORD dwSize = 0; + DWORD dwMinSize = 0; + DWORD dwNameLength = 0; + DWORD dwError = 0; memset(computerName1, 0xAA, nameBufferSize); memset(computerName2, 0xBB, nameBufferSize); diff --git a/winpr/libwinpr/thread/apc.c b/winpr/libwinpr/thread/apc.c index 0d655a9c4..b05eb8d62 100644 --- a/winpr/libwinpr/thread/apc.c +++ b/winpr/libwinpr/thread/apc.c @@ -62,8 +62,8 @@ BOOL apc_uninit(APC_QUEUE* apc) void apc_register(WINPR_THREAD* thread, WINPR_APC_ITEM* addItem) { - WINPR_APC_ITEM** nextp; - APC_QUEUE* apc; + WINPR_APC_ITEM** nextp = NULL; + APC_QUEUE* apc = NULL; WINPR_ASSERT(thread); WINPR_ASSERT(addItem); @@ -113,7 +113,7 @@ static INLINE void apc_item_remove(APC_QUEUE* apc, WINPR_APC_ITEM* item) APC_REMOVE_RESULT apc_remove(WINPR_APC_ITEM* item) { WINPR_THREAD* thread = winpr_GetCurrentThread(); - APC_QUEUE* apc; + APC_QUEUE* apc = NULL; APC_REMOVE_RESULT ret = APC_REMOVE_OK; WINPR_ASSERT(item); @@ -155,9 +155,9 @@ out: BOOL apc_collectFds(WINPR_THREAD* thread, WINPR_POLL_SET* set, BOOL* haveAutoSignaled) { - WINPR_APC_ITEM* item; + WINPR_APC_ITEM* item = NULL; BOOL ret = FALSE; - APC_QUEUE* apc; + APC_QUEUE* apc = NULL; WINPR_ASSERT(thread); WINPR_ASSERT(haveAutoSignaled); @@ -186,9 +186,9 @@ out: int apc_executeCompletions(WINPR_THREAD* thread, WINPR_POLL_SET* set, size_t idx) { - APC_QUEUE* apc; - WINPR_APC_ITEM* item; - WINPR_APC_ITEM* nextItem; + APC_QUEUE* apc = NULL; + WINPR_APC_ITEM* item = NULL; + WINPR_APC_ITEM* nextItem = NULL; int ret = 0; WINPR_ASSERT(thread); @@ -241,9 +241,9 @@ int apc_executeCompletions(WINPR_THREAD* thread, WINPR_POLL_SET* set, size_t idx void apc_cleanupThread(WINPR_THREAD* thread) { - WINPR_APC_ITEM* item; - WINPR_APC_ITEM* nextItem; - APC_QUEUE* apc; + WINPR_APC_ITEM* item = NULL; + WINPR_APC_ITEM* nextItem = NULL; + APC_QUEUE* apc = NULL; WINPR_ASSERT(thread); diff --git a/winpr/libwinpr/thread/argv.c b/winpr/libwinpr/thread/argv.c index c00d16a99..da6099d82 100644 --- a/winpr/libwinpr/thread/argv.c +++ b/winpr/libwinpr/thread/argv.c @@ -88,19 +88,19 @@ LPSTR* CommandLineToArgvA(LPCSTR lpCmdLine, int* pNumArgs) { - const char* p; - size_t length; - const char* pBeg; - const char* pEnd; - char* buffer; - char* pOutput; + const char* p = NULL; + size_t length = 0; + const char* pBeg = NULL; + const char* pEnd = NULL; + char* buffer = NULL; + char* pOutput = NULL; int numArgs = 0; - LPSTR* pArgs; - size_t maxNumArgs; - size_t maxBufferSize; - size_t cmdLineLength; - BOOL* lpEscapedChars; - LPSTR lpEscapedCmdLine; + LPSTR* pArgs = NULL; + size_t maxNumArgs = 0; + size_t maxBufferSize = 0; + size_t cmdLineLength = 0; + BOOL* lpEscapedChars = NULL; + LPSTR lpEscapedCmdLine = NULL; if (!lpCmdLine) return NULL; @@ -118,8 +118,8 @@ LPSTR* CommandLineToArgvA(LPCSTR lpCmdLine, int* pNumArgs) if (strstr(lpCmdLine, "\\\"")) { - size_t i; - size_t n; + size_t i = 0; + size_t n = 0; const char* pLastEnd = NULL; lpEscapedCmdLine = (char*)calloc(cmdLineLength + 1, sizeof(char)); diff --git a/winpr/libwinpr/thread/process.c b/winpr/libwinpr/thread/process.c index bf0ff3559..3701b8acc 100644 --- a/winpr/libwinpr/thread/process.c +++ b/winpr/libwinpr/thread/process.c @@ -98,10 +98,10 @@ static char* FindApplicationPath(char* application) { LPCSTR pathName = "PATH"; - char* path; - char* save; - DWORD nSize; - LPSTR lpSystemPath; + char* path = NULL; + char* save = NULL; + DWORD nSize = 0; + LPSTR lpSystemPath = NULL; char* filename = NULL; if (!application) @@ -157,15 +157,15 @@ static BOOL _CreateProcessExA(HANDLE hToken, DWORD dwLogonFlags, LPCSTR lpApplic LPCSTR lpCurrentDirectory, LPSTARTUPINFOA lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation) { - pid_t pid; - int numArgs; + pid_t pid = 0; + int numArgs = 0; LPSTR* pArgs = NULL; char** envp = NULL; char* filename = NULL; - HANDLE thread; - HANDLE process; - WINPR_ACCESS_TOKEN* token; - LPTCH lpszEnvironmentBlock; + HANDLE thread = NULL; + HANDLE process = NULL; + WINPR_ACCESS_TOKEN* token = NULL; + LPTCH lpszEnvironmentBlock = NULL; BOOL ret = FALSE; sigset_t oldSigMask; sigset_t newSigMask; @@ -222,10 +222,10 @@ static BOOL _CreateProcessExA(HANDLE hToken, DWORD dwLogonFlags, LPCSTR lpApplic { /* child process */ #ifndef __sun - int maxfd; + int maxfd = 0; #endif - int fd; - int sig; + int fd = 0; + int sig = 0; sigset_t set = { 0 }; struct sigaction act = { 0 }; /* set default signal handlers */ @@ -242,7 +242,7 @@ static BOOL _CreateProcessExA(HANDLE hToken, DWORD dwLogonFlags, LPCSTR lpApplic if (lpStartupInfo) { - int handle_fd; + int handle_fd = 0; handle_fd = winpr_Handle_getFd(lpStartupInfo->hStdOutput); if (handle_fd != -1) @@ -446,7 +446,7 @@ VOID ExitProcess(UINT uExitCode) BOOL GetExitCodeProcess(HANDLE hProcess, LPDWORD lpExitCode) { - WINPR_PROCESS* process; + WINPR_PROCESS* process = NULL; if (!hProcess) return FALSE; @@ -471,7 +471,7 @@ DWORD GetCurrentProcessId(VOID) BOOL TerminateProcess(HANDLE hProcess, UINT uExitCode) { - WINPR_PROCESS* process; + WINPR_PROCESS* process = NULL; process = (WINPR_PROCESS*)hProcess; if (!process || (process->pid <= 0)) @@ -562,7 +562,7 @@ static int _pidfd_open(pid_t pid) { /* possibly PIDFD_NONBLOCK is not supported, let's try to create a pidfd and set it * non blocking afterward */ - int flags; + int flags = 0; fd = syscall(__NR_pidfd_open, pid, 0); if (fd < 0) return -1; @@ -582,7 +582,7 @@ static int _pidfd_open(pid_t pid) HANDLE CreateProcessHandle(pid_t pid) { - WINPR_PROCESS* process; + WINPR_PROCESS* process = NULL; process = (WINPR_PROCESS*)calloc(1, sizeof(WINPR_PROCESS)); if (!process) diff --git a/winpr/libwinpr/thread/test/TestThreadCommandLineToArgv.c b/winpr/libwinpr/thread/test/TestThreadCommandLineToArgv.c index c1736e27e..62cd42892 100644 --- a/winpr/libwinpr/thread/test/TestThreadCommandLineToArgv.c +++ b/winpr/libwinpr/thread/test/TestThreadCommandLineToArgv.c @@ -34,9 +34,9 @@ static const char* test_args_list_7[] = { "app.exe", "a\\\\b c", "d", "e", static int test_command_line_parsing_case(const char* line, const char** list) { - int i; - LPSTR* pArgs; - int numArgs; + int i = 0; + LPSTR* pArgs = NULL; + int numArgs = 0; pArgs = NULL; numArgs = 0; diff --git a/winpr/libwinpr/thread/test/TestThreadCreateProcess.c b/winpr/libwinpr/thread/test/TestThreadCreateProcess.c index 369245fcb..1260c1b51 100644 --- a/winpr/libwinpr/thread/test/TestThreadCreateProcess.c +++ b/winpr/libwinpr/thread/test/TestThreadCreateProcess.c @@ -12,9 +12,9 @@ int TestThreadCreateProcess(int argc, char* argv[]) { - BOOL status; - DWORD exitCode; - LPCTSTR lpApplicationName; + BOOL status = 0; + DWORD exitCode = 0; + LPCTSTR lpApplicationName = NULL; #ifdef _WIN32 TCHAR lpCommandLine[200] = _T("cmd /C set"); @@ -23,19 +23,19 @@ int TestThreadCreateProcess(int argc, char* argv[]) #endif // LPTSTR lpCommandLine; - LPSECURITY_ATTRIBUTES lpProcessAttributes; - LPSECURITY_ATTRIBUTES lpThreadAttributes; - BOOL bInheritHandles; - DWORD dwCreationFlags; - LPVOID lpEnvironment; - LPCTSTR lpCurrentDirectory; + LPSECURITY_ATTRIBUTES lpProcessAttributes = NULL; + LPSECURITY_ATTRIBUTES lpThreadAttributes = NULL; + BOOL bInheritHandles = 0; + DWORD dwCreationFlags = 0; + LPVOID lpEnvironment = NULL; + LPCTSTR lpCurrentDirectory = NULL; STARTUPINFO StartupInfo = { 0 }; PROCESS_INFORMATION ProcessInformation = { 0 }; - LPTCH lpszEnvironmentBlock; + LPTCH lpszEnvironmentBlock = NULL; HANDLE pipe_read = NULL; HANDLE pipe_write = NULL; char buf[1024] = { 0 }; - DWORD read_bytes; + DWORD read_bytes = 0; int ret = 0; SECURITY_ATTRIBUTES saAttr; diff --git a/winpr/libwinpr/thread/test/TestThreadExitThread.c b/winpr/libwinpr/thread/test/TestThreadExitThread.c index fd9b3ddf0..f7484dddb 100644 --- a/winpr/libwinpr/thread/test/TestThreadExitThread.c +++ b/winpr/libwinpr/thread/test/TestThreadExitThread.c @@ -15,9 +15,9 @@ static DWORD WINAPI thread_func(LPVOID arg) int TestThreadExitThread(int argc, char* argv[]) { - HANDLE thread; - DWORD waitResult; - int i; + HANDLE thread = NULL; + DWORD waitResult = 0; + int i = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/thread/thread.c b/winpr/libwinpr/thread/thread.c index b54d4f1af..be2beec7d 100644 --- a/winpr/libwinpr/thread/thread.c +++ b/winpr/libwinpr/thread/thread.c @@ -124,7 +124,7 @@ static BOOL run_mutex_init_(int (*fkt)(pthread_mutex_t*, const pthread_mutexattr const char* name, pthread_mutex_t* mutex, const pthread_mutexattr_t* mutexattr) { - int rc; + int rc = 0; WINPR_ASSERT(fkt); WINPR_ASSERT(mutex); @@ -142,7 +142,7 @@ static BOOL run_mutex_init_(int (*fkt)(pthread_mutex_t*, const pthread_mutexattr static BOOL run_mutex_fkt_(int (*fkt)(pthread_mutex_t* mux), const char* name, pthread_mutex_t* mutex) { - int rc; + int rc = 0; WINPR_ASSERT(fkt); WINPR_ASSERT(mutex); @@ -160,7 +160,7 @@ static BOOL run_mutex_fkt_(int (*fkt)(pthread_mutex_t* mux), const char* name, static BOOL run_cond_init_(int (*fkt)(pthread_cond_t*, const pthread_condattr_t*), const char* name, pthread_cond_t* condition, const pthread_condattr_t* conditionattr) { - int rc; + int rc = 0; WINPR_ASSERT(fkt); WINPR_ASSERT(condition); @@ -178,7 +178,7 @@ static BOOL run_cond_init_(int (*fkt)(pthread_cond_t*, const pthread_condattr_t* static BOOL run_cond_fkt_(int (*fkt)(pthread_cond_t* mux), const char* name, pthread_cond_t* condition) { - int rc; + int rc = 0; WINPR_ASSERT(fkt); WINPR_ASSERT(condition); @@ -361,9 +361,9 @@ static void dump_thread(WINPR_THREAD* thread) { #if defined(WITH_DEBUG_THREADS) void* stack = winpr_backtrace(20); - char** msg; - size_t used; - size_t i; + char** msg = NULL; + size_t used = 0; + size_t i = 0; WLog_DBG(TAG, "Called from:"); msg = winpr_backtrace_symbols(stack, &used); @@ -503,7 +503,7 @@ static void* thread_launcher(void* arg) { DWORD rc = 0; WINPR_THREAD* thread = (WINPR_THREAD*)arg; - LPTHREAD_START_ROUTINE fkt; + LPTHREAD_START_ROUTINE fkt = NULL; if (!thread) { @@ -610,7 +610,7 @@ HANDLE CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, SIZE_T dwStackSize LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId) { - HANDLE handle; + HANDLE handle = NULL; WINPR_THREAD* thread = (WINPR_THREAD*)calloc(1, sizeof(WINPR_THREAD)); if (!thread) @@ -799,9 +799,9 @@ VOID ExitThread(DWORD dwExitCode) BOOL GetExitCodeThread(HANDLE hThread, LPDWORD lpExitCode) { - ULONG Type; - WINPR_HANDLE* Object; - WINPR_THREAD* thread; + ULONG Type = 0; + WINPR_HANDLE* Object = NULL; + WINPR_THREAD* thread = NULL; if (!winpr_Handle_GetInfo(hThread, &Type, &Object) || Object->Type != HANDLE_TYPE_THREAD) { @@ -817,7 +817,7 @@ BOOL GetExitCodeThread(HANDLE hThread, LPDWORD lpExitCode) WINPR_THREAD* winpr_GetCurrentThread(VOID) { - WINPR_THREAD* ret; + WINPR_THREAD* ret = NULL; InitOnceExecuteOnce(&threads_InitOnce, initializeThreads, NULL, NULL); if (mainThreadId == pthread_self()) @@ -834,7 +834,7 @@ HANDLE _GetCurrentThread(VOID) DWORD GetCurrentThreadId(VOID) { - pthread_t tid; + pthread_t tid = 0; tid = pthread_self(); /* Since pthread_t can be 64-bits on some systems, take just the */ /* lower 32-bits of it for the thread ID returned by this function. */ @@ -859,10 +859,10 @@ static void userAPC(LPVOID arg) DWORD QueueUserAPC(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData) { - ULONG Type; - WINPR_HANDLE* Object; - WINPR_APC_ITEM* apc; - UserApcItem* apcItem; + ULONG Type = 0; + WINPR_HANDLE* Object = NULL; + WINPR_APC_ITEM* apc = NULL; + UserApcItem* apcItem = NULL; if (!pfnAPC) return 1; @@ -895,9 +895,9 @@ DWORD QueueUserAPC(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData) DWORD ResumeThread(HANDLE hThread) { - ULONG Type; - WINPR_HANDLE* Object; - WINPR_THREAD* thread; + ULONG Type = 0; + WINPR_HANDLE* Object = NULL; + WINPR_THREAD* thread = NULL; if (!winpr_Handle_GetInfo(hThread, &Type, &Object) || Object->Type != HANDLE_TYPE_THREAD) { @@ -949,9 +949,9 @@ BOOL SwitchToThread(VOID) BOOL TerminateThread(HANDLE hThread, DWORD dwExitCode) { - ULONG Type; - WINPR_HANDLE* Object; - WINPR_THREAD* thread; + ULONG Type = 0; + WINPR_HANDLE* Object = NULL; + WINPR_THREAD* thread = NULL; if (!winpr_Handle_GetInfo(hThread, &Type, &Object)) return FALSE; @@ -979,9 +979,9 @@ BOOL TerminateThread(HANDLE hThread, DWORD dwExitCode) VOID DumpThreadHandles(void) { #if defined(WITH_DEBUG_THREADS) - char** msg; - size_t used; - size_t i; + char** msg = NULL; + size_t used = 0; + size_t i = 0; void* stack = winpr_backtrace(20); WLog_DBG(TAG, "---------------- Called from ----------------------------"); msg = winpr_backtrace_symbols(stack, &used); diff --git a/winpr/libwinpr/thread/tls.c b/winpr/libwinpr/thread/tls.c index 5db7317bc..977d47d2a 100644 --- a/winpr/libwinpr/thread/tls.c +++ b/winpr/libwinpr/thread/tls.c @@ -36,7 +36,7 @@ DWORD TlsAlloc(void) { - pthread_key_t key; + pthread_key_t key = 0; if (pthread_key_create(&key, NULL) != 0) return TLS_OUT_OF_INDEXES; @@ -46,8 +46,8 @@ DWORD TlsAlloc(void) LPVOID TlsGetValue(DWORD dwTlsIndex) { - LPVOID value; - pthread_key_t key; + LPVOID value = NULL; + pthread_key_t key = 0; key = (pthread_key_t)dwTlsIndex; value = (LPVOID)pthread_getspecific(key); return value; @@ -55,7 +55,7 @@ LPVOID TlsGetValue(DWORD dwTlsIndex) BOOL TlsSetValue(DWORD dwTlsIndex, LPVOID lpTlsValue) { - pthread_key_t key; + pthread_key_t key = 0; key = (pthread_key_t)dwTlsIndex; pthread_setspecific(key, lpTlsValue); return TRUE; @@ -63,7 +63,7 @@ BOOL TlsSetValue(DWORD dwTlsIndex, LPVOID lpTlsValue) BOOL TlsFree(DWORD dwTlsIndex) { - pthread_key_t key; + pthread_key_t key = 0; key = (pthread_key_t)dwTlsIndex; pthread_key_delete(key); return TRUE; diff --git a/winpr/libwinpr/timezone/timezone.c b/winpr/libwinpr/timezone/timezone.c index fc7a276f3..1cb4bbdf6 100644 --- a/winpr/libwinpr/timezone/timezone.c +++ b/winpr/libwinpr/timezone/timezone.c @@ -38,8 +38,8 @@ static UINT64 winpr_windows_gmtime(void) { - time_t unix_time; - UINT64 windows_time; + time_t unix_time = 0; + UINT64 windows_time = 0; time(&unix_time); if (unix_time < 0) @@ -54,7 +54,7 @@ static UINT64 winpr_windows_gmtime(void) static char* winpr_read_unix_timezone_identifier_from_file(FILE* fp) { const INT CHUNK_SIZE = 32; - INT64 rc; + INT64 rc = 0; INT64 read = 0; INT64 length = CHUNK_SIZE; char* tzid = NULL; @@ -102,7 +102,7 @@ static char* winpr_read_unix_timezone_identifier_from_file(FILE* fp) static char* winpr_get_timezone_from_link(const char* links[], size_t count) { const char* _links[] = { "/etc/localtime", "/etc/TZ" }; - size_t x; + size_t x = 0; if (links == NULL) { @@ -125,7 +125,7 @@ static char* winpr_get_timezone_from_link(const char* links[], size_t count) if (buf) { - size_t i; + size_t i = 0; size_t sep = 0; size_t alloc = 0; size_t pos = 0; @@ -247,7 +247,7 @@ static char* winpr_get_unix_timezone_identifier_from_file(void) #if defined(ANDROID) return winpr_get_android_timezone_identifier(); #else - FILE* fp; + FILE* fp = NULL; char* tzid = NULL; #if defined(__FreeBSD__) || defined(__OpenBSD__) fp = winpr_fopen("/var/db/zoneinfo", "r"); @@ -268,8 +268,8 @@ static char* winpr_get_unix_timezone_identifier_from_file(void) static BOOL winpr_match_unix_timezone_identifier_with_list(const char* tzid, const char* list) { - char* p; - char* list_copy; + char* p = NULL; + char* list_copy = NULL; char* context = NULL; list_copy = _strdup(list); @@ -296,8 +296,8 @@ static BOOL winpr_match_unix_timezone_identifier_with_list(const char* tzid, con static TIME_ZONE_ENTRY* winpr_detect_windows_time_zone(void) { - size_t i; - size_t j; + size_t i = 0; + size_t j = 0; char* tzid = NULL; char* ntzid = NULL; LPCSTR tz = "TZ"; @@ -373,8 +373,8 @@ static TIME_ZONE_ENTRY* winpr_detect_windows_time_zone(void) static const TIME_ZONE_RULE_ENTRY* winpr_get_current_time_zone_rule(const TIME_ZONE_RULE_ENTRY* rules, UINT32 count) { - UINT32 i; - UINT64 windows_time; + UINT32 i = 0; + UINT64 windows_time = 0; windows_time = winpr_windows_gmtime(); for (i = 0; i < count; i++) @@ -393,9 +393,9 @@ winpr_get_current_time_zone_rule(const TIME_ZONE_RULE_ENTRY* rules, UINT32 count DWORD GetTimeZoneInformation(LPTIME_ZONE_INFORMATION lpTimeZoneInformation) { - time_t t; + time_t t = 0; struct tm tres; - struct tm* local_time; + struct tm* local_time = NULL; TIME_ZONE_ENTRY* dtz = NULL; LPTIME_ZONE_INFORMATION tz = lpTimeZoneInformation; lpTimeZoneInformation->StandardBias = 0; diff --git a/winpr/libwinpr/utils/asn1/asn1.c b/winpr/libwinpr/utils/asn1/asn1.c index 721abfe23..fdf2446cf 100644 --- a/winpr/libwinpr/utils/asn1/asn1.c +++ b/winpr/libwinpr/utils/asn1/asn1.c @@ -176,7 +176,7 @@ void WinPrAsn1Encoder_Reset(WinPrAsn1Encoder* enc) void WinPrAsn1Encoder_Free(WinPrAsn1Encoder** penc) { - WinPrAsn1Encoder* enc; + WinPrAsn1Encoder* enc = NULL; WINPR_ASSERT(penc); enc = *penc; @@ -197,7 +197,7 @@ void WinPrAsn1Encoder_Free(WinPrAsn1Encoder** penc) static Asn1Chunk* asn1enc_get_free_chunk(WinPrAsn1Encoder* enc, size_t chunkSz, BOOL commit, size_t* id) { - Asn1Chunk* ret; + Asn1Chunk* ret = NULL; WINPR_ASSERT(enc); WINPR_ASSERT(chunkSz); @@ -257,7 +257,7 @@ static Asn1Chunk* asn1enc_get_free_chunk(WinPrAsn1Encoder* enc, size_t chunkSz, static WinPrAsn1EncContainer* asn1enc_get_free_container(WinPrAsn1Encoder* enc, size_t* id) { - WinPrAsn1EncContainer* ret; + WinPrAsn1EncContainer* ret = NULL; WINPR_ASSERT(enc); if (enc->freeContainerIndex == enc->containerCapacity) @@ -331,9 +331,9 @@ static void asn1WriteLen(wStream* s, size_t len) static WinPrAsn1EncContainer* getAsn1Container(WinPrAsn1Encoder* enc, ContainerType ctype, WinPrAsn1_tag tag, BOOL contextual, size_t maxLen) { - size_t ret; - size_t chunkId; - WinPrAsn1EncContainer* container; + size_t ret = 0; + size_t chunkId = 0; + WinPrAsn1EncContainer* container = NULL; Asn1Chunk* chunk = asn1enc_get_free_chunk(enc, maxLen, FALSE, &chunkId); if (!chunk) @@ -390,14 +390,14 @@ BOOL WinPrAsn1EncContextualOctetStringContainer(WinPrAsn1Encoder* enc, WinPrAsn1 size_t WinPrAsn1EncEndContainer(WinPrAsn1Encoder* enc) { - size_t innerLen; - size_t i; - size_t unused; - size_t innerHeaderBytes; - size_t outerHeaderBytes; + size_t innerLen = 0; + size_t i = 0; + size_t unused = 0; + size_t innerHeaderBytes = 0; + size_t outerHeaderBytes = 0; BYTE containerByte = 0; - WinPrAsn1EncContainer* container; - Asn1Chunk* chunk; + WinPrAsn1EncContainer* container = NULL; + Asn1Chunk* chunk = NULL; wStream staticS; wStream* s = &staticS; @@ -480,7 +480,7 @@ size_t WinPrAsn1EncEndContainer(WinPrAsn1Encoder* enc) static BOOL asn1_getWriteStream(WinPrAsn1Encoder* enc, size_t len, wStream* s) { - BYTE* dest; + BYTE* dest = NULL; Asn1Chunk* chunk = asn1enc_get_free_chunk(enc, len, TRUE, NULL); if (!chunk) return FALSE; @@ -541,7 +541,7 @@ static size_t WinPrAsn1EncIntegerLike(WinPrAsn1Encoder* enc, WinPrAsn1_tag b, { wStream staticS; wStream* s = &staticS; - size_t len; + size_t len = 0; len = asn1IntegerLen(value); if (!asn1_getWriteStream(enc, 1 + len, s)) @@ -581,8 +581,8 @@ static size_t WinPrAsn1EncContextualIntegerLike(WinPrAsn1Encoder* enc, WinPrAsn1 { wStream staticS; wStream* s = &staticS; - size_t len; - size_t outLen; + size_t len = 0; + size_t outLen = 0; WINPR_ASSERT(enc); WINPR_ASSERT_VALID_TAG(tagId); @@ -667,7 +667,7 @@ static size_t WinPrAsn1EncMemoryChunk(WinPrAsn1Encoder* enc, BYTE wireType, const WinPrAsn1_MemoryChunk* mchunk) { wStream s; - size_t len; + size_t len = 0; WINPR_ASSERT(enc); WINPR_ASSERT(mchunk); @@ -715,8 +715,8 @@ static size_t WinPrAsn1EncContextualMemoryChunk(WinPrAsn1Encoder* enc, BYTE wire const WinPrAsn1_MemoryChunk* mchunk) { wStream s; - size_t len; - size_t outLen; + size_t len = 0; + size_t outLen = 0; WINPR_ASSERT(enc); WINPR_ASSERT_VALID_TAG(tagId); @@ -824,7 +824,7 @@ size_t WinPrAsn1EncContextualUtcTime(WinPrAsn1Encoder* enc, WinPrAsn1_tagId tagI BOOL WinPrAsn1EncStreamSize(WinPrAsn1Encoder* enc, size_t* s) { size_t finalSize = 0; - size_t i; + size_t i = 0; WINPR_ASSERT(enc); WINPR_ASSERT(s); @@ -843,8 +843,8 @@ BOOL WinPrAsn1EncStreamSize(WinPrAsn1Encoder* enc, size_t* s) BOOL WinPrAsn1EncToStream(WinPrAsn1Encoder* enc, wStream* s) { - size_t finalSize; - size_t i; + size_t finalSize = 0; + size_t i = 0; WINPR_ASSERT(enc); WINPR_ASSERT(s); @@ -897,7 +897,7 @@ BOOL WinPrAsn1DecPeekTag(WinPrAsn1Decoder* dec, WinPrAsn1_tag* tag) static size_t readLen(wStream* s, size_t* len, BOOL derCheck) { - size_t retLen; + size_t retLen = 0; size_t ret = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) @@ -934,7 +934,7 @@ static size_t readLen(wStream* s, size_t* len, BOOL derCheck) static size_t readTagAndLen(WinPrAsn1Decoder* dec, wStream* s, WinPrAsn1_tag* tag, size_t* len) { - size_t lenBytes; + size_t lenBytes = 0; if (Stream_GetRemainingLength(s) < 1) return 0; @@ -971,7 +971,7 @@ size_t WinPrAsn1DecPeekTagAndLen(WinPrAsn1Decoder* dec, WinPrAsn1_tag* tag, size size_t WinPrAsn1DecReadTagLenValue(WinPrAsn1Decoder* dec, WinPrAsn1_tag* tag, size_t* len, WinPrAsn1Decoder* value) { - size_t ret; + size_t ret = 0; WINPR_ASSERT(dec); WINPR_ASSERT(tag); WINPR_ASSERT(len); @@ -992,10 +992,10 @@ size_t WinPrAsn1DecReadTagLenValue(WinPrAsn1Decoder* dec, WinPrAsn1_tag* tag, si size_t WinPrAsn1DecReadBoolean(WinPrAsn1Decoder* dec, WinPrAsn1_BOOL* target) { - BYTE v; - WinPrAsn1_tag tag; - size_t len; - size_t ret; + BYTE v = 0; + WinPrAsn1_tag tag = 0; + size_t len = 0; + size_t ret = 0; WINPR_ASSERT(dec); WINPR_ASSERT(target); @@ -1014,10 +1014,10 @@ size_t WinPrAsn1DecReadBoolean(WinPrAsn1Decoder* dec, WinPrAsn1_BOOL* target) static size_t WinPrAsn1DecReadIntegerLike(WinPrAsn1Decoder* dec, WinPrAsn1_tag expectedTag, WinPrAsn1_INTEGER* target) { - signed char v; - WinPrAsn1_tag tag; - size_t len; - size_t ret; + signed char v = 0; + WinPrAsn1_tag tag = 0; + size_t len = 0; + size_t ret = 0; WINPR_ASSERT(dec); WINPR_ASSERT(target); @@ -1052,9 +1052,9 @@ size_t WinPrAsn1DecReadEnumerated(WinPrAsn1Decoder* dec, WinPrAsn1_ENUMERATED* t static size_t WinPrAsn1DecReadMemoryChunkLike(WinPrAsn1Decoder* dec, WinPrAsn1_tag expectedTag, WinPrAsn1_MemoryChunk* target, BOOL allocate) { - WinPrAsn1_tag tag; - size_t len; - size_t ret; + WinPrAsn1_tag tag = 0; + size_t len = 0; + size_t ret = 0; WINPR_ASSERT(dec); WINPR_ASSERT(target); @@ -1099,10 +1099,10 @@ size_t WinPrAsn1DecReadOctetString(WinPrAsn1Decoder* dec, WinPrAsn1_OctetString* size_t WinPrAsn1DecReadIA5String(WinPrAsn1Decoder* dec, WinPrAsn1_IA5STRING* target) { - WinPrAsn1_tag tag; - size_t len; - size_t ret; - WinPrAsn1_IA5STRING s; + WinPrAsn1_tag tag = 0; + size_t len = 0; + size_t ret = 0; + WinPrAsn1_IA5STRING s = NULL; WINPR_ASSERT(dec); WINPR_ASSERT(target); @@ -1126,10 +1126,10 @@ size_t WinPrAsn1DecReadIA5String(WinPrAsn1Decoder* dec, WinPrAsn1_IA5STRING* tar size_t WinPrAsn1DecReadGeneralString(WinPrAsn1Decoder* dec, WinPrAsn1_STRING* target) { - WinPrAsn1_tag tag; - size_t len; - size_t ret; - WinPrAsn1_IA5STRING s; + WinPrAsn1_tag tag = 0; + size_t len = 0; + size_t ret = 0; + WinPrAsn1_IA5STRING s = NULL; WINPR_ASSERT(dec); WINPR_ASSERT(target); @@ -1154,7 +1154,7 @@ size_t WinPrAsn1DecReadGeneralString(WinPrAsn1Decoder* dec, WinPrAsn1_STRING* ta static int read2digits(wStream* s) { int ret = 0; - char c; + char c = 0; Stream_Read_UINT8(s, c); if (c < '0' || c > '9') @@ -1172,10 +1172,10 @@ static int read2digits(wStream* s) size_t WinPrAsn1DecReadUtcTime(WinPrAsn1Decoder* dec, WinPrAsn1_UTCTIME* target) { - WinPrAsn1_tag tag; - size_t len; - size_t ret; - int v; + WinPrAsn1_tag tag = 0; + size_t len = 0; + size_t ret = 0; + int v = 0; wStream sub; wStream* s = ⊂ @@ -1233,9 +1233,9 @@ size_t WinPrAsn1DecReadUtcTime(WinPrAsn1Decoder* dec, WinPrAsn1_UTCTIME* target) size_t WinPrAsn1DecReadNull(WinPrAsn1Decoder* dec) { - WinPrAsn1_tag tag; - size_t len; - size_t ret; + WinPrAsn1_tag tag = 0; + size_t len = 0; + size_t ret = 0; WINPR_ASSERT(dec); @@ -1249,8 +1249,8 @@ size_t WinPrAsn1DecReadNull(WinPrAsn1Decoder* dec) static size_t readConstructed(WinPrAsn1Decoder* dec, wStream* s, WinPrAsn1_tag* tag, WinPrAsn1Decoder* target) { - size_t len; - size_t ret; + size_t len = 0; + size_t ret = 0; ret = readTagAndLen(dec, s, tag, &len); if (!ret || !Stream_CheckAndLogRequiredLength(TAG, s, len)) @@ -1264,8 +1264,8 @@ static size_t readConstructed(WinPrAsn1Decoder* dec, wStream* s, WinPrAsn1_tag* size_t WinPrAsn1DecReadApp(WinPrAsn1Decoder* dec, WinPrAsn1_tagId* tagId, WinPrAsn1Decoder* target) { - WinPrAsn1_tag tag; - size_t ret; + WinPrAsn1_tag tag = 0; + size_t ret = 0; WINPR_ASSERT(dec); WINPR_ASSERT(target); @@ -1280,8 +1280,8 @@ size_t WinPrAsn1DecReadApp(WinPrAsn1Decoder* dec, WinPrAsn1_tagId* tagId, WinPrA size_t WinPrAsn1DecReadSequence(WinPrAsn1Decoder* dec, WinPrAsn1Decoder* target) { - WinPrAsn1_tag tag; - size_t ret; + WinPrAsn1_tag tag = 0; + size_t ret = 0; WINPR_ASSERT(dec); WINPR_ASSERT(target); @@ -1295,8 +1295,8 @@ size_t WinPrAsn1DecReadSequence(WinPrAsn1Decoder* dec, WinPrAsn1Decoder* target) size_t WinPrAsn1DecReadSet(WinPrAsn1Decoder* dec, WinPrAsn1Decoder* target) { - WinPrAsn1_tag tag; - size_t ret; + WinPrAsn1_tag tag = 0; + size_t ret = 0; WINPR_ASSERT(dec); WINPR_ASSERT(target); @@ -1311,8 +1311,8 @@ size_t WinPrAsn1DecReadSet(WinPrAsn1Decoder* dec, WinPrAsn1Decoder* target) static size_t readContextualTag(WinPrAsn1Decoder* dec, wStream* s, WinPrAsn1_tagId* tagId, WinPrAsn1Decoder* ctxtDec) { - size_t ret; - WinPrAsn1_tag ftag; + size_t ret = 0; + WinPrAsn1_tag ftag = 0; ret = readConstructed(dec, s, &ftag, ctxtDec); if (!ret) @@ -1349,8 +1349,8 @@ size_t WinPrAsn1DecPeekContextualTag(WinPrAsn1Decoder* dec, WinPrAsn1_tagId* tag static size_t readContextualHeader(WinPrAsn1Decoder* dec, WinPrAsn1_tagId tagId, BOOL* error, WinPrAsn1Decoder* content) { - WinPrAsn1_tag ftag; - size_t ret; + WinPrAsn1_tag ftag = 0; + size_t ret = 0; WINPR_ASSERT(dec); WINPR_ASSERT(error); @@ -1374,8 +1374,8 @@ static size_t readContextualHeader(WinPrAsn1Decoder* dec, WinPrAsn1_tagId tagId, size_t WinPrAsn1DecReadContextualBool(WinPrAsn1Decoder* dec, WinPrAsn1_tagId tagId, BOOL* error, WinPrAsn1_BOOL* target) { - size_t ret; - size_t ret2; + size_t ret = 0; + size_t ret2 = 0; WinPrAsn1Decoder content; ret = readContextualHeader(dec, tagId, error, &content); @@ -1396,8 +1396,8 @@ size_t WinPrAsn1DecReadContextualBool(WinPrAsn1Decoder* dec, WinPrAsn1_tagId tag size_t WinPrAsn1DecReadContextualInteger(WinPrAsn1Decoder* dec, WinPrAsn1_tagId tagId, BOOL* error, WinPrAsn1_INTEGER* target) { - size_t ret; - size_t ret2; + size_t ret = 0; + size_t ret2 = 0; WinPrAsn1Decoder content; ret = readContextualHeader(dec, tagId, error, &content); @@ -1418,8 +1418,8 @@ size_t WinPrAsn1DecReadContextualInteger(WinPrAsn1Decoder* dec, WinPrAsn1_tagId size_t WinPrAsn1DecReadContextualOID(WinPrAsn1Decoder* dec, WinPrAsn1_tagId tagId, BOOL* error, WinPrAsn1_OID* target, BOOL allocate) { - size_t ret; - size_t ret2; + size_t ret = 0; + size_t ret2 = 0; WinPrAsn1Decoder content; ret = readContextualHeader(dec, tagId, error, &content); @@ -1441,8 +1441,8 @@ size_t WinPrAsn1DecReadContextualOctetString(WinPrAsn1Decoder* dec, WinPrAsn1_ta BOOL* error, WinPrAsn1_OctetString* target, BOOL allocate) { - size_t ret; - size_t ret2; + size_t ret = 0; + size_t ret2 = 0; WinPrAsn1Decoder content; ret = readContextualHeader(dec, tagId, error, &content); @@ -1463,8 +1463,8 @@ size_t WinPrAsn1DecReadContextualOctetString(WinPrAsn1Decoder* dec, WinPrAsn1_ta size_t WinPrAsn1DecReadContextualSequence(WinPrAsn1Decoder* dec, WinPrAsn1_tagId tagId, BOOL* error, WinPrAsn1Decoder* target) { - size_t ret; - size_t ret2; + size_t ret = 0; + size_t ret2 = 0; WinPrAsn1Decoder content; ret = readContextualHeader(dec, tagId, error, &content); diff --git a/winpr/libwinpr/utils/cmdline.c b/winpr/libwinpr/utils/cmdline.c index 19b560116..cceea5f14 100644 --- a/winpr/libwinpr/utils/cmdline.c +++ b/winpr/libwinpr/utils/cmdline.c @@ -57,20 +57,20 @@ int CommandLineParseArgumentsA(int argc, LPSTR* argv, COMMAND_LINE_ARGUMENT_A* o void* context, COMMAND_LINE_PRE_FILTER_FN_A preFilter, COMMAND_LINE_POST_FILTER_FN_A postFilter) { - int i; - int j; - int status; - int count; - size_t length; - BOOL notescaped; - const char* sigil; - size_t sigil_length; - char* keyword; - size_t keyword_length; - SSIZE_T keyword_index; - char* separator; - char* value; - int toggle; + int i = 0; + int j = 0; + int status = 0; + int count = 0; + size_t length = 0; + BOOL notescaped = 0; + const char* sigil = NULL; + size_t sigil_length = 0; + char* keyword = NULL; + size_t keyword_length = 0; + SSIZE_T keyword_index = 0; + char* separator = NULL; + char* value = NULL; + int toggle = 0; status = 0; notescaped = FALSE; @@ -241,7 +241,7 @@ int CommandLineParseArgumentsA(int argc, LPSTR* argv, COMMAND_LINE_ARGUMENT_A* o if ((flags & COMMAND_LINE_SEPARATOR_SPACE) && ((i + 1) < argc)) { - BOOL argument; + BOOL argument = 0; int value_present = 1; if (flags & COMMAND_LINE_SIGIL_DASH) @@ -397,7 +397,7 @@ int CommandLineParseArgumentsW(int argc, LPWSTR* argv, COMMAND_LINE_ARGUMENT_W* int CommandLineClearArgumentsA(COMMAND_LINE_ARGUMENT_A* options) { - size_t i; + size_t i = 0; for (i = 0; options[i].Name != NULL; i++) { @@ -410,7 +410,7 @@ int CommandLineClearArgumentsA(COMMAND_LINE_ARGUMENT_A* options) int CommandLineClearArgumentsW(COMMAND_LINE_ARGUMENT_W* options) { - int i; + int i = 0; for (i = 0; options[i].Name != NULL; i++) { @@ -424,7 +424,7 @@ int CommandLineClearArgumentsW(COMMAND_LINE_ARGUMENT_W* options) const COMMAND_LINE_ARGUMENT_A* CommandLineFindArgumentA(const COMMAND_LINE_ARGUMENT_A* options, LPCSTR Name) { - size_t i; + size_t i = 0; WINPR_ASSERT(options); WINPR_ASSERT(Name); @@ -447,7 +447,7 @@ const COMMAND_LINE_ARGUMENT_A* CommandLineFindArgumentA(const COMMAND_LINE_ARGUM const COMMAND_LINE_ARGUMENT_W* CommandLineFindArgumentW(const COMMAND_LINE_ARGUMENT_W* options, LPCWSTR Name) { - size_t i; + size_t i = 0; WINPR_ASSERT(options); WINPR_ASSERT(Name); @@ -469,7 +469,7 @@ const COMMAND_LINE_ARGUMENT_W* CommandLineFindArgumentW(const COMMAND_LINE_ARGUM const COMMAND_LINE_ARGUMENT_A* CommandLineFindNextArgumentA(const COMMAND_LINE_ARGUMENT_A* argument) { - const COMMAND_LINE_ARGUMENT_A* nextArgument; + const COMMAND_LINE_ARGUMENT_A* nextArgument = NULL; if (!argument || !argument->Name) return NULL; @@ -673,8 +673,8 @@ char** CommandLineParseCommaSeparatedValuesEx(const char* name, const char* list *count = 0; if (list) { - int start; - int end; + int start = 0; + int end = 0; unquoted = copy = _strdup(list); if (!copy) goto fail; @@ -815,7 +815,7 @@ char* CommandLineToCommaSeparatedValues(int argc, char* argv[]) static const char* filtered(const char* arg, const char* filters[], size_t number) { - size_t x; + size_t x = 0; if (number == 0) return arg; for (x = 0; x < number; x++) @@ -831,7 +831,7 @@ static const char* filtered(const char* arg, const char* filters[], size_t numbe char* CommandLineToCommaSeparatedValuesEx(int argc, char* argv[], const char* filters[], size_t number) { - int x; + int x = 0; char* str = NULL; size_t offset = 0; size_t size = argc + 1; @@ -846,7 +846,7 @@ char* CommandLineToCommaSeparatedValuesEx(int argc, char* argv[], const char* fi return NULL; for (x = 0; x < argc; x++) { - int rc; + int rc = 0; const char* arg = filtered(argv[x], filters, number); if (!arg) continue; diff --git a/winpr/libwinpr/utils/collections/ArrayList.c b/winpr/libwinpr/utils/collections/ArrayList.c index c8b9a300a..8a1120166 100644 --- a/winpr/libwinpr/utils/collections/ArrayList.c +++ b/winpr/libwinpr/utils/collections/ArrayList.c @@ -202,7 +202,7 @@ static BOOL ArrayList_EnsureCapacity(wArrayList* arrayList, size_t count) if (arrayList->size + count > arrayList->capacity) { - void** newArray; + void** newArray = NULL; size_t newCapacity = arrayList->capacity * arrayList->growthFactor; if (newCapacity < arrayList->size + count) newCapacity = arrayList->size + count; @@ -254,7 +254,7 @@ static BOOL ArrayList_Shift(wArrayList* arrayList, size_t index, SSIZE_T count) void ArrayList_Clear(wArrayList* arrayList) { - size_t index; + size_t index = 0; WINPR_ASSERT(arrayList); ArrayList_Lock_Conditional(arrayList); @@ -278,7 +278,7 @@ void ArrayList_Clear(wArrayList* arrayList) BOOL ArrayList_Contains(wArrayList* arrayList, const void* obj) { - size_t index; + size_t index = 0; BOOL rc = FALSE; WINPR_ASSERT(arrayList); @@ -313,7 +313,7 @@ int ArrayList_Add(wArrayList* arrayList, const void* obj) BOOL ArrayList_Append(wArrayList* arrayList, const void* obj) { - size_t index; + size_t index = 0; BOOL rc = FALSE; WINPR_ASSERT(arrayList); @@ -365,7 +365,7 @@ BOOL ArrayList_Insert(wArrayList* arrayList, size_t index, const void* obj) BOOL ArrayList_Remove(wArrayList* arrayList, const void* obj) { - size_t index; + size_t index = 0; BOOL found = FALSE; BOOL ret = TRUE; @@ -433,9 +433,9 @@ BOOL ArrayList_RemoveAt(wArrayList* arrayList, size_t index) SSIZE_T ArrayList_IndexOf(wArrayList* arrayList, const void* obj, SSIZE_T startIndex, SSIZE_T count) { - SSIZE_T index; - SSIZE_T sindex; - SSIZE_T cindex; + SSIZE_T index = 0; + SSIZE_T sindex = 0; + SSIZE_T cindex = 0; BOOL found = FALSE; WINPR_ASSERT(arrayList); @@ -482,9 +482,9 @@ SSIZE_T ArrayList_IndexOf(wArrayList* arrayList, const void* obj, SSIZE_T startI SSIZE_T ArrayList_LastIndexOf(wArrayList* arrayList, const void* obj, SSIZE_T startIndex, SSIZE_T count) { - SSIZE_T index; - SSIZE_T sindex; - SSIZE_T cindex; + SSIZE_T index = 0; + SSIZE_T sindex = 0; + SSIZE_T cindex = 0; BOOL found = FALSE; WINPR_ASSERT(arrayList); @@ -528,7 +528,7 @@ wObject* ArrayList_Object(wArrayList* arrayList) BOOL ArrayList_ForEach(wArrayList* arrayList, ArrayList_ForEachFkt fkt, ...) { - BOOL rc; + BOOL rc = 0; va_list ap; va_start(ap, fkt); rc = ArrayList_ForEachAP(arrayList, fkt, ap); @@ -539,8 +539,8 @@ BOOL ArrayList_ForEach(wArrayList* arrayList, ArrayList_ForEachFkt fkt, ...) BOOL ArrayList_ForEachAP(wArrayList* arrayList, ArrayList_ForEachFkt fkt, va_list ap) { - size_t index; - size_t count; + size_t index = 0; + size_t count = 0; BOOL rc = FALSE; va_list cap; @@ -551,7 +551,7 @@ BOOL ArrayList_ForEachAP(wArrayList* arrayList, ArrayList_ForEachFkt fkt, va_lis count = ArrayList_Count(arrayList); for (index = 0; index < count; index++) { - BOOL rs; + BOOL rs = 0; void* obj = ArrayList_GetItem(arrayList, index); va_copy(cap, ap); rs = fkt(obj, index, cap); @@ -571,7 +571,7 @@ fail: wArrayList* ArrayList_New(BOOL synchronized) { - wObject* obj; + wObject* obj = NULL; wArrayList* arrayList = NULL; arrayList = (wArrayList*)calloc(1, sizeof(wArrayList)); diff --git a/winpr/libwinpr/utils/collections/BitStream.c b/winpr/libwinpr/utils/collections/BitStream.c index 77da58415..bbbb09ecd 100644 --- a/winpr/libwinpr/utils/collections/BitStream.c +++ b/winpr/libwinpr/utils/collections/BitStream.c @@ -95,7 +95,7 @@ static const char* BYTE_BIT_STRINGS_MSB[256] = { void BitDump(const char* tag, UINT32 level, const BYTE* buffer, UINT32 length, UINT32 flags) { - DWORD i; + DWORD i = 0; const char** strs = (flags & BITDUMP_MSB_FIRST) ? BYTE_BIT_STRINGS_MSB : BYTE_BIT_STRINGS_LSB; char pbuffer[64 * 8 + 1] = { 0 }; size_t pos = 0; diff --git a/winpr/libwinpr/utils/collections/BufferPool.c b/winpr/libwinpr/utils/collections/BufferPool.c index b6ded5d92..a176e42a2 100644 --- a/winpr/libwinpr/utils/collections/BufferPool.c +++ b/winpr/libwinpr/utils/collections/BufferPool.c @@ -84,7 +84,7 @@ static BOOL BufferPool_ShiftAvailable(wBufferPool* pool, size_t index, int count { if (pool->aSize + count > pool->aCapacity) { - wBufferPoolItem* newArray; + wBufferPoolItem* newArray = NULL; SSIZE_T newCapacity = pool->aCapacity * 2; if (pool->alignment > 0) @@ -119,7 +119,7 @@ static BOOL BufferPool_ShiftUsed(wBufferPool* pool, SSIZE_T index, SSIZE_T count if (pool->uSize + count > pool->uCapacity) { SSIZE_T newUCapacity = pool->uCapacity * 2; - wBufferPoolItem* newUArray; + wBufferPoolItem* newUArray = NULL; if (pool->alignment > 0) newUArray = (wBufferPoolItem*)winpr_aligned_realloc( pool->uArray, sizeof(wBufferPoolItem) * newUCapacity, pool->alignment); @@ -151,7 +151,7 @@ static BOOL BufferPool_ShiftUsed(wBufferPool* pool, SSIZE_T index, SSIZE_T count SSIZE_T BufferPool_GetPoolSize(wBufferPool* pool) { - SSIZE_T size; + SSIZE_T size = 0; BufferPool_Lock(pool); @@ -215,9 +215,9 @@ SSIZE_T BufferPool_GetBufferSize(wBufferPool* pool, const void* buffer) void* BufferPool_Take(wBufferPool* pool, SSIZE_T size) { - SSIZE_T index; - SSIZE_T maxSize; - SSIZE_T maxIndex; + SSIZE_T index = 0; + SSIZE_T maxSize = 0; + SSIZE_T maxIndex = 0; SSIZE_T foundIndex = -1; BOOL found = FALSE; void* buffer = NULL; @@ -295,7 +295,7 @@ void* BufferPool_Take(wBufferPool* pool, SSIZE_T size) if (maxSize < size) { - void* newBuffer; + void* newBuffer = NULL; if (pool->alignment) newBuffer = winpr_aligned_realloc(buffer, size, pool->alignment); else diff --git a/winpr/libwinpr/utils/collections/HashTable.c b/winpr/libwinpr/utils/collections/HashTable.c index e577a4df7..ddb45f7f1 100644 --- a/winpr/libwinpr/utils/collections/HashTable.c +++ b/winpr/libwinpr/utils/collections/HashTable.c @@ -83,7 +83,7 @@ BOOL HashTable_StringCompare(const void* string1, const void* string2) UINT32 HashTable_StringHash(const void* key) { - UINT32 c; + UINT32 c = 0; UINT32 hash = 5381; const BYTE* str = (const BYTE*)key; @@ -106,7 +106,7 @@ void HashTable_StringFree(void* str) static INLINE BOOL HashTable_IsProbablePrime(size_t oddNumber) { - size_t i; + size_t i = 0; for (i = 3; i < 51; i += 2) { @@ -139,11 +139,11 @@ static INLINE size_t HashTable_CalculateIdealNumOfBuckets(wHashTable* table) static INLINE void HashTable_Rehash(wHashTable* table, size_t numOfBuckets) { - size_t index; - UINT32 hashValue; - wKeyValuePair* pair; - wKeyValuePair* nextPair; - wKeyValuePair** newBucketArray; + size_t index = 0; + UINT32 hashValue = 0; + wKeyValuePair* pair = NULL; + wKeyValuePair* nextPair = NULL; + wKeyValuePair** newBucketArray = NULL; WINPR_ASSERT(table); if (numOfBuckets == 0) @@ -192,8 +192,8 @@ static INLINE BOOL HashTable_Equals(wHashTable* table, const wKeyValuePair* pair static INLINE wKeyValuePair* HashTable_Get(wHashTable* table, const void* key) { - UINT32 hashValue; - wKeyValuePair* pair; + UINT32 hashValue = 0; + wKeyValuePair* pair = NULL; WINPR_ASSERT(table); if (!key) @@ -310,9 +310,9 @@ int HashTable_Add(wHashTable* table, const void* key, const void* value) BOOL HashTable_Insert(wHashTable* table, const void* key, const void* value) { BOOL rc = FALSE; - UINT32 hashValue; - wKeyValuePair* pair; - wKeyValuePair* newPair; + UINT32 hashValue = 0; + wKeyValuePair* pair = NULL; + wKeyValuePair* newPair = NULL; WINPR_ASSERT(table); if (!key || !value) @@ -385,7 +385,7 @@ BOOL HashTable_Insert(wHashTable* table, const void* key, const void* value) BOOL HashTable_Remove(wHashTable* table, const void* key) { - UINT32 hashValue; + UINT32 hashValue = 0; BOOL status = TRUE; wKeyValuePair* pair = NULL; wKeyValuePair* previousPair = NULL; @@ -451,7 +451,7 @@ out: void* HashTable_GetItemValue(wHashTable* table, const void* key) { void* value = NULL; - wKeyValuePair* pair; + wKeyValuePair* pair = NULL; WINPR_ASSERT(table); if (!key) @@ -478,7 +478,7 @@ void* HashTable_GetItemValue(wHashTable* table, const void* key) BOOL HashTable_SetItemValue(wHashTable* table, const void* key, const void* value) { BOOL status = TRUE; - wKeyValuePair* pair; + wKeyValuePair* pair = NULL; WINPR_ASSERT(table); if (!key) @@ -508,9 +508,9 @@ BOOL HashTable_SetItemValue(wHashTable* table, const void* key, const void* valu void HashTable_Clear(wHashTable* table) { - size_t index; - wKeyValuePair* pair; - wKeyValuePair* nextPair; + size_t index = 0; + wKeyValuePair* pair = NULL; + wKeyValuePair* nextPair = NULL; WINPR_ASSERT(table); @@ -555,12 +555,12 @@ void HashTable_Clear(wHashTable* table) size_t HashTable_GetKeys(wHashTable* table, ULONG_PTR** ppKeys) { - size_t iKey; - size_t count; - size_t index; - ULONG_PTR* pKeys; - wKeyValuePair* pair; - wKeyValuePair* nextPair; + size_t iKey = 0; + size_t count = 0; + size_t index = 0; + ULONG_PTR* pKeys = NULL; + wKeyValuePair* pair = NULL; + wKeyValuePair* nextPair = NULL; WINPR_ASSERT(table); @@ -615,8 +615,8 @@ size_t HashTable_GetKeys(wHashTable* table, ULONG_PTR** ppKeys) BOOL HashTable_Foreach(wHashTable* table, HASH_TABLE_FOREACH_FN fn, VOID* arg) { BOOL ret = TRUE; - size_t index; - wKeyValuePair* pair; + size_t index = 0; + wKeyValuePair* pair = NULL; WINPR_ASSERT(table); WINPR_ASSERT(fn); @@ -641,10 +641,10 @@ BOOL HashTable_Foreach(wHashTable* table, HASH_TABLE_FOREACH_FN fn, VOID* arg) if (!table->foreachRecursionLevel && table->pendingRemoves) { /* if we're the last recursive foreach call, let's do the cleanup if needed */ - wKeyValuePair** prevPtr; + wKeyValuePair** prevPtr = NULL; for (index = 0; index < table->numOfBuckets; index++) { - wKeyValuePair* nextPair; + wKeyValuePair* nextPair = NULL; prevPtr = &table->bucketArray[index]; for (pair = table->bucketArray[index]; pair;) { @@ -677,8 +677,8 @@ out: BOOL HashTable_Contains(wHashTable* table, const void* key) { - BOOL status; - wKeyValuePair* pair; + BOOL status = 0; + wKeyValuePair* pair = NULL; WINPR_ASSERT(table); if (!key) @@ -702,8 +702,8 @@ BOOL HashTable_Contains(wHashTable* table, const void* key) BOOL HashTable_ContainsKey(wHashTable* table, const void* key) { - BOOL status; - wKeyValuePair* pair; + BOOL status = 0; + wKeyValuePair* pair = NULL; WINPR_ASSERT(table); if (!key) @@ -727,9 +727,9 @@ BOOL HashTable_ContainsKey(wHashTable* table, const void* key) BOOL HashTable_ContainsValue(wHashTable* table, const void* value) { - size_t index; + size_t index = 0; BOOL status = FALSE; - wKeyValuePair* pair; + wKeyValuePair* pair = NULL; WINPR_ASSERT(table); if (!value) @@ -801,9 +801,9 @@ fail: void HashTable_Free(wHashTable* table) { - size_t index; - wKeyValuePair* pair; - wKeyValuePair* nextPair; + size_t index = 0; + wKeyValuePair* pair = NULL; + wKeyValuePair* nextPair = NULL; if (!table) return; @@ -862,7 +862,7 @@ BOOL HashTable_SetHashFunction(wHashTable* table, HASH_TABLE_HASH_FN fn) BOOL HashTable_SetupForStringData(wHashTable* table, BOOL stringValues) { - wObject* obj; + wObject* obj = NULL; if (!HashTable_SetHashFunction(table, HashTable_StringHash)) return FALSE; diff --git a/winpr/libwinpr/utils/collections/LinkedList.c b/winpr/libwinpr/utils/collections/LinkedList.c index 91290756a..48d64d94e 100644 --- a/winpr/libwinpr/utils/collections/LinkedList.c +++ b/winpr/libwinpr/utils/collections/LinkedList.c @@ -98,8 +98,8 @@ void* LinkedList_Last(wLinkedList* list) BOOL LinkedList_Contains(wLinkedList* list, const void* value) { - wLinkedListNode* item; - OBJECT_EQUALS_FN keyEquals; + wLinkedListNode* item = NULL; + OBJECT_EQUALS_FN keyEquals = NULL; WINPR_ASSERT(list); if (!list->head) @@ -121,8 +121,8 @@ BOOL LinkedList_Contains(wLinkedList* list, const void* value) static wLinkedListNode* LinkedList_FreeNode(wLinkedList* list, wLinkedListNode* node) { - wLinkedListNode* next; - wLinkedListNode* prev; + wLinkedListNode* next = NULL; + wLinkedListNode* prev = NULL; WINPR_ASSERT(list); WINPR_ASSERT(node); @@ -158,7 +158,7 @@ static wLinkedListNode* LinkedList_FreeNode(wLinkedList* list, wLinkedListNode* void LinkedList_Clear(wLinkedList* list) { - wLinkedListNode* node; + wLinkedListNode* node = NULL; WINPR_ASSERT(list); if (!list->head) return; @@ -174,7 +174,7 @@ void LinkedList_Clear(wLinkedList* list) static wLinkedListNode* LinkedList_Create(wLinkedList* list, const void* value) { - wLinkedListNode* node; + wLinkedListNode* node = NULL; WINPR_ASSERT(list); node = (wLinkedListNode*)calloc(1, sizeof(wLinkedListNode)); @@ -258,8 +258,8 @@ BOOL LinkedList_AddLast(wLinkedList* list, const void* value) BOOL LinkedList_Remove(wLinkedList* list, const void* value) { - wLinkedListNode* node; - OBJECT_EQUALS_FN keyEquals; + wLinkedListNode* node = NULL; + OBJECT_EQUALS_FN keyEquals = NULL; WINPR_ASSERT(list); keyEquals = list->object.fnObjectEquals; diff --git a/winpr/libwinpr/utils/collections/ListDictionary.c b/winpr/libwinpr/utils/collections/ListDictionary.c index f04004ada..cf238a9d3 100644 --- a/winpr/libwinpr/utils/collections/ListDictionary.c +++ b/winpr/libwinpr/utils/collections/ListDictionary.c @@ -284,8 +284,8 @@ out_error: void ListDictionary_Clear(wListDictionary* listDictionary) { - wListDictionaryItem* item; - wListDictionaryItem* nextItem; + wListDictionaryItem* item = NULL; + wListDictionaryItem* nextItem = NULL; WINPR_ASSERT(listDictionary); @@ -317,8 +317,8 @@ void ListDictionary_Clear(wListDictionary* listDictionary) BOOL ListDictionary_Contains(wListDictionary* listDictionary, const void* key) { - wListDictionaryItem* item; - OBJECT_EQUALS_FN keyEquals; + wListDictionaryItem* item = NULL; + OBJECT_EQUALS_FN keyEquals = NULL; WINPR_ASSERT(listDictionary); @@ -350,9 +350,9 @@ static void* ListDictionary_RemoveOrTake(wListDictionary* listDictionary, const BOOL take) { void* value = NULL; - wListDictionaryItem* item; - wListDictionaryItem* prevItem; - OBJECT_EQUALS_FN keyEquals; + wListDictionaryItem* item = NULL; + wListDictionaryItem* prevItem = NULL; + OBJECT_EQUALS_FN keyEquals = NULL; WINPR_ASSERT(listDictionary); @@ -407,7 +407,7 @@ void* ListDictionary_Take(wListDictionary* listDictionary, const void* key) static void* ListDictionary_Remove_Or_Take_Head(wListDictionary* listDictionary, BOOL take) { - wListDictionaryItem* item; + wListDictionaryItem* item = NULL; void* value = NULL; WINPR_ASSERT(listDictionary); @@ -451,7 +451,7 @@ void* ListDictionary_GetItemValue(wListDictionary* listDictionary, const void* k { void* value = NULL; wListDictionaryItem* item = NULL; - OBJECT_EQUALS_FN keyEquals; + OBJECT_EQUALS_FN keyEquals = NULL; WINPR_ASSERT(listDictionary); @@ -489,8 +489,8 @@ BOOL ListDictionary_SetItemValue(wListDictionary* listDictionary, const void* ke const void* value) { BOOL status = FALSE; - wListDictionaryItem* item; - OBJECT_EQUALS_FN keyEquals; + wListDictionaryItem* item = NULL; + OBJECT_EQUALS_FN keyEquals = NULL; WINPR_ASSERT(listDictionary); diff --git a/winpr/libwinpr/utils/collections/MessageQueue.c b/winpr/libwinpr/utils/collections/MessageQueue.c index 6c5335920..5481bd4ab 100644 --- a/winpr/libwinpr/utils/collections/MessageQueue.c +++ b/winpr/libwinpr/utils/collections/MessageQueue.c @@ -95,7 +95,7 @@ static BOOL MessageQueue_EnsureCapacity(wMessageQueue* queue, size_t count) if (queue->size + count >= queue->capacity) { - wMessage* new_arr; + wMessage* new_arr = NULL; size_t old_capacity = queue->capacity; size_t new_capacity = queue->capacity * 2; @@ -122,7 +122,7 @@ static BOOL MessageQueue_EnsureCapacity(wMessageQueue* queue, size_t count) BOOL MessageQueue_Dispatch(wMessageQueue* queue, const wMessage* message) { - wMessage* dst; + wMessage* dst = NULL; BOOL ret = FALSE; WINPR_ASSERT(queue); diff --git a/winpr/libwinpr/utils/collections/ObjectPool.c b/winpr/libwinpr/utils/collections/ObjectPool.c index 593bd3862..d7bb62357 100644 --- a/winpr/libwinpr/utils/collections/ObjectPool.c +++ b/winpr/libwinpr/utils/collections/ObjectPool.c @@ -94,8 +94,8 @@ void ObjectPool_Return(wObjectPool* pool, void* obj) if ((pool->size + 1) >= pool->capacity) { - size_t new_cap; - void** new_arr; + size_t new_cap = 0; + void** new_arr = NULL; new_cap = pool->capacity * 2; new_arr = (void**)realloc(pool->array, sizeof(void*) * new_cap); diff --git a/winpr/libwinpr/utils/collections/PubSub.c b/winpr/libwinpr/utils/collections/PubSub.c index 1b820b08d..8715585e3 100644 --- a/winpr/libwinpr/utils/collections/PubSub.c +++ b/winpr/libwinpr/utils/collections/PubSub.c @@ -71,7 +71,7 @@ void PubSub_Unlock(wPubSub* pubSub) wEventType* PubSub_FindEventType(wPubSub* pubSub, const char* EventName) { - size_t index; + size_t index = 0; wEventType* event = NULL; WINPR_ASSERT(pubSub); @@ -97,8 +97,8 @@ void PubSub_AddEventTypes(wPubSub* pubSub, wEventType* events, size_t count) while (pubSub->count + count >= pubSub->size) { - size_t new_size; - wEventType* new_event; + size_t new_size = 0; + wEventType* new_event = NULL; new_size = pubSub->size * 2; new_event = (wEventType*)realloc(pubSub->events, new_size * sizeof(wEventType)); @@ -117,7 +117,7 @@ void PubSub_AddEventTypes(wPubSub* pubSub, wEventType* events, size_t count) int PubSub_Subscribe(wPubSub* pubSub, const char* EventName, ...) { - wEventType* event; + wEventType* event = NULL; int status = -1; WINPR_ASSERT(pubSub); @@ -149,8 +149,8 @@ int PubSub_Subscribe(wPubSub* pubSub, const char* EventName, ...) int PubSub_Unsubscribe(wPubSub* pubSub, const char* EventName, ...) { - size_t index; - wEventType* event; + size_t index = 0; + wEventType* event = NULL; int status = -1; WINPR_ASSERT(pubSub); WINPR_ASSERT(EventName); @@ -190,8 +190,8 @@ int PubSub_Unsubscribe(wPubSub* pubSub, const char* EventName, ...) int PubSub_OnEvent(wPubSub* pubSub, const char* EventName, void* context, const wEventArgs* e) { - size_t index; - wEventType* event; + size_t index = 0; + wEventType* event = NULL; int status = -1; if (!pubSub) diff --git a/winpr/libwinpr/utils/collections/Queue.c b/winpr/libwinpr/utils/collections/Queue.c index 203f98dc2..dd5f48842 100644 --- a/winpr/libwinpr/utils/collections/Queue.c +++ b/winpr/libwinpr/utils/collections/Queue.c @@ -60,7 +60,7 @@ struct s_wQueue size_t Queue_Count(wQueue* queue) { - size_t ret; + size_t ret = 0; Queue_Lock(queue); @@ -119,7 +119,7 @@ wObject* Queue_Object(wQueue* queue) void Queue_Clear(wQueue* queue) { - size_t index; + size_t index = 0; Queue_Lock(queue); @@ -143,7 +143,7 @@ void Queue_Clear(wQueue* queue) BOOL Queue_Contains(wQueue* queue, const void* obj) { - size_t index; + size_t index = 0; BOOL found = FALSE; Queue_Lock(queue); @@ -170,7 +170,7 @@ static BOOL Queue_EnsureCapacity(wQueue* queue, size_t count) { const size_t old_capacity = queue->capacity; size_t new_capacity = queue->capacity * queue->growthFactor; - void** newArray; + void** newArray = NULL; if (new_capacity < queue->size + count) new_capacity = queue->size + count; newArray = (void**)realloc(queue->array, sizeof(void*) * new_capacity); @@ -273,7 +273,7 @@ void* Queue_Peek(wQueue* queue) void Queue_Discard(wQueue* queue) { - void* obj; + void* obj = NULL; Queue_Lock(queue); obj = Queue_Dequeue(queue); @@ -294,7 +294,7 @@ static BOOL default_queue_equals(const void* obj1, const void* obj2) wQueue* Queue_New(BOOL synchronized, SSIZE_T capacity, SSIZE_T growthFactor) { - wObject* obj; + wObject* obj = NULL; wQueue* queue = NULL; queue = (wQueue*)calloc(1, sizeof(wQueue)); diff --git a/winpr/libwinpr/utils/collections/Stack.c b/winpr/libwinpr/utils/collections/Stack.c index e3b90f8a9..55aad3695 100644 --- a/winpr/libwinpr/utils/collections/Stack.c +++ b/winpr/libwinpr/utils/collections/Stack.c @@ -47,7 +47,7 @@ struct s_wStack size_t Stack_Count(wStack* stack) { - size_t ret; + size_t ret = 0; WINPR_ASSERT(stack); if (stack->synchronized) EnterCriticalSection(&stack->lock); @@ -86,7 +86,7 @@ wObject* Stack_Object(wStack* stack) void Stack_Clear(wStack* stack) { - size_t index; + size_t index = 0; WINPR_ASSERT(stack); if (stack->synchronized) @@ -112,7 +112,7 @@ void Stack_Clear(wStack* stack) BOOL Stack_Contains(wStack* stack, const void* obj) { - size_t i; + size_t i = 0; BOOL found = FALSE; WINPR_ASSERT(stack); diff --git a/winpr/libwinpr/utils/collections/StreamPool.c b/winpr/libwinpr/utils/collections/StreamPool.c index dcaecfb5a..31838a4b7 100644 --- a/winpr/libwinpr/utils/collections/StreamPool.c +++ b/winpr/libwinpr/utils/collections/StreamPool.c @@ -66,9 +66,9 @@ static INLINE void StreamPool_Unlock(wStreamPool* pool) static BOOL StreamPool_EnsureCapacity(wStreamPool* pool, size_t count, BOOL usedOrAvailable) { size_t new_cap = 0; - size_t* cap; - size_t* size; - wStream*** array; + size_t* cap = NULL; + size_t* size = NULL; + wStream*** array = NULL; WINPR_ASSERT(pool); @@ -84,7 +84,7 @@ static BOOL StreamPool_EnsureCapacity(wStreamPool* pool, size_t count, BOOL used if (new_cap > 0) { - wStream** new_arr; + wStream** new_arr = NULL; if (*cap < *size + count) *cap += count; @@ -143,7 +143,7 @@ static void StreamPool_AddUsed(wStreamPool* pool, wStream* s) static void StreamPool_RemoveUsed(wStreamPool* pool, wStream* s) { - size_t index; + size_t index = 0; BOOL found = FALSE; WINPR_ASSERT(pool); @@ -192,8 +192,8 @@ static void StreamPool_ShiftAvailable(wStreamPool* pool, size_t index, INT64 cou wStream* StreamPool_Take(wStreamPool* pool, size_t size) { - size_t index; - SSIZE_T foundIndex; + size_t index = 0; + SSIZE_T foundIndex = 0; wStream* s = NULL; StreamPool_Lock(pool); @@ -311,7 +311,7 @@ void Stream_Release(wStream* s) wStream* StreamPool_Find(wStreamPool* pool, BYTE* ptr) { - size_t index; + size_t index = 0; wStream* s = NULL; BOOL found = FALSE; diff --git a/winpr/libwinpr/utils/debug.c b/winpr/libwinpr/utils/debug.c index 4111ff871..679638538 100644 --- a/winpr/libwinpr/utils/debug.c +++ b/winpr/libwinpr/utils/debug.c @@ -178,14 +178,13 @@ void winpr_backtrace_symbols_fd(void* buffer, int fd) winpr_execinfo_backtrace_symbols_fd(buffer, fd); #elif !defined(ANDROID) { - size_t i; size_t used = 0; char** lines = winpr_backtrace_symbols(buffer, &used); if (!lines) return; - for (i = 0; i < used; i++) + for (size_t i = 0; i < used; i++) _write(fd, lines[i], (unsigned)strnlen(lines[i], UINT32_MAX)); free(lines); } @@ -201,9 +200,9 @@ void winpr_log_backtrace(const char* tag, DWORD level, DWORD size) void winpr_log_backtrace_ex(wLog* log, DWORD level, DWORD size) { - size_t used; - size_t x; - char** msg; + size_t used = 0; + size_t x = 0; + char** msg = NULL; void* stack = winpr_backtrace(20); if (!stack) diff --git a/winpr/libwinpr/utils/image.c b/winpr/libwinpr/utils/image.c index bb9584e8b..c728c911a 100644 --- a/winpr/libwinpr/utils/image.c +++ b/winpr/libwinpr/utils/image.c @@ -125,8 +125,8 @@ BYTE* winpr_bitmap_construct_header(size_t width, size_t height, size_t bpp) BYTE* result = NULL; WINPR_BITMAP_FILE_HEADER bf = { 0 }; WINPR_BITMAP_INFO_HEADER bi = { 0 }; - wStream* s; - size_t imgSize; + wStream* s = NULL; + size_t imgSize = 0; imgSize = width * height * (bpp / 8); if ((width > INT32_MAX) || (height > INT32_MAX) || (bpp > UINT16_MAX) || (imgSize > UINT32_MAX)) @@ -280,9 +280,9 @@ int winpr_image_write_ex(wImage* image, UINT32 format, const char* filename) static int winpr_image_bitmap_read_buffer(wImage* image, const BYTE* buffer, size_t size) { int rc = -1; - UINT32 index; - BOOL vFlip; - BYTE* pDstData; + UINT32 index = 0; + BOOL vFlip = 0; + BYTE* pDstData = NULL; WINPR_BITMAP_FILE_HEADER bf; WINPR_BITMAP_INFO_HEADER bi; wStream sbuffer = { 0 }; diff --git a/winpr/libwinpr/utils/ini.c b/winpr/libwinpr/utils/ini.c index 8b64fc127..5ebac34cc 100644 --- a/winpr/libwinpr/utils/ini.c +++ b/winpr/libwinpr/utils/ini.c @@ -105,7 +105,7 @@ static BOOL IniFile_BufferResize(wIniFile* ini, size_t size) static BOOL IniFile_Load_String(wIniFile* ini, const char* iniString) { - size_t fileSize; + size_t fileSize = 0; WINPR_ASSERT(ini); @@ -150,7 +150,7 @@ static FILE* IniFile_Open_File(wIniFile* ini, const char* filename) static BOOL IniFile_Load_File(wIniFile* ini, const char* filename) { BOOL rc = FALSE; - INT64 fileSize; + INT64 fileSize = 0; WINPR_ASSERT(ini); @@ -425,11 +425,11 @@ static wIniFileKey* IniFile_AddKey(wIniFileSection* section, const char* name, c static int IniFile_Load(wIniFile* ini) { - char* name; - char* value; - char* separator; - char* beg; - char* end; + char* name = NULL; + char* value = NULL; + char* separator = NULL; + char* beg = NULL; + char* end = NULL; wIniFileSection* section = NULL; WINPR_ASSERT(ini); @@ -507,7 +507,7 @@ static BOOL IniFile_SetFilename(wIniFile* ini, const char* name) int IniFile_ReadBuffer(wIniFile* ini, const char* buffer) { - BOOL status; + BOOL status = 0; WINPR_ASSERT(ini); @@ -648,7 +648,7 @@ const char* IniFile_GetKeyValueString(wIniFile* ini, const char* section, const int IniFile_GetKeyValueInt(wIniFile* ini, const char* section, const char* key) { - int err; + int err = 0; long value = 0; wIniFileKey* pKey = NULL; wIniFileSection* pSection = NULL; diff --git a/winpr/libwinpr/utils/ntlm.c b/winpr/libwinpr/utils/ntlm.c index 6c6083b44..25e0e5a59 100644 --- a/winpr/libwinpr/utils/ntlm.c +++ b/winpr/libwinpr/utils/ntlm.c @@ -123,7 +123,7 @@ out_fail: BOOL NTOWFv2FromHashW(BYTE* NtHashV1, LPWSTR User, UINT32 UserLength, LPWSTR Domain, UINT32 DomainLength, BYTE* NtHash) { - BYTE* buffer; + BYTE* buffer = NULL; BYTE result = FALSE; if (!User || !NtHash) diff --git a/winpr/libwinpr/utils/print.c b/winpr/libwinpr/utils/print.c index 59a0de220..ec1854878 100644 --- a/winpr/libwinpr/utils/print.c +++ b/winpr/libwinpr/utils/print.c @@ -43,8 +43,8 @@ void winpr_HexDump(const char* tag, UINT32 level, const void* data, size_t lengt void winpr_HexLogDump(wLog* log, UINT32 lvl, const void* data, size_t length) { const BYTE* p = data; - size_t i; - size_t line; + size_t i = 0; + size_t line = 0; size_t offset = 0; const size_t maxlen = 20; /* 64bit SIZE_MAX as decimal */ /* String line length: @@ -58,7 +58,7 @@ void winpr_HexLogDump(wLog* log, UINT32 lvl, const void* data, size_t length) (maxlen + 3) + (WINPR_HEXDUMP_LINE_LENGTH * 3) + 3 + WINPR_HEXDUMP_LINE_LENGTH + 1; size_t pos = 0; - char* buffer; + char* buffer = NULL; if (!WLog_IsLevelActive(log, lvl)) return; @@ -134,10 +134,10 @@ fail: void winpr_CArrayDump(const char* tag, UINT32 level, const void* data, size_t length, size_t width) { const BYTE* p = data; - size_t i; + size_t i = 0; size_t offset = 0; const size_t llen = ((length > width) ? width : length) * 4ull + 1ull; - size_t pos; + size_t pos = 0; char* buffer = malloc(llen); if (!buffer) @@ -187,9 +187,9 @@ static BYTE value(char c) size_t winpr_HexStringToBinBuffer(const char* str, size_t strLength, BYTE* data, size_t dataLength) { - size_t x; + size_t x = 0; size_t y = 0; - size_t maxStrLen; + size_t maxStrLen = 0; if (!str || !data || (strLength == 0) || (dataLength == 0)) return 0; @@ -217,7 +217,7 @@ size_t winpr_BinToHexStringBuffer(const BYTE* data, size_t length, char* dstStr, const size_t n = space ? 3 : 2; const char bin2hex[] = "0123456789ABCDEF"; const size_t maxLength = MIN(length, dstSize / n); - size_t i; + size_t i = 0; if (!data || !dstStr || (length == 0) || (dstSize == 0)) return 0; @@ -246,7 +246,7 @@ size_t winpr_BinToHexStringBuffer(const BYTE* data, size_t length, char* dstStr, char* winpr_BinToHexString(const BYTE* data, size_t length, BOOL space) { - size_t rc; + size_t rc = 0; const size_t n = space ? 3 : 2; const size_t size = (length + 1ULL) * n; char* p = (char*)malloc(size); diff --git a/winpr/libwinpr/utils/sam.c b/winpr/libwinpr/utils/sam.c index 6ca544d49..31163d9df 100644 --- a/winpr/libwinpr/utils/sam.c +++ b/winpr/libwinpr/utils/sam.c @@ -123,8 +123,8 @@ WINPR_SAM* SamOpen(const char* filename, BOOL readOnly) static BOOL SamLookupStart(WINPR_SAM* sam) { - size_t readSize; - INT64 fileSize; + size_t readSize = 0; + INT64 fileSize = 0; if (!sam || !sam->fp) return FALSE; @@ -173,10 +173,10 @@ static void SamLookupFinish(WINPR_SAM* sam) static BOOL SamReadEntry(WINPR_SAM* sam, WINPR_SAM_ENTRY* entry) { char* p[5]; - size_t LmHashLength; - size_t NtHashLength; + size_t LmHashLength = 0; + size_t NtHashLength = 0; size_t count = 0; - char* cur; + char* cur = NULL; if (!sam || !entry || !sam->line) return FALSE; @@ -280,7 +280,7 @@ void SamResetEntry(WINPR_SAM_ENTRY* entry) WINPR_SAM_ENTRY* SamLookupUserA(WINPR_SAM* sam, LPCSTR User, UINT32 UserLength, LPCSTR Domain, UINT32 DomainLength) { - size_t length; + size_t length = 0; BOOL found = FALSE; WINPR_SAM_ENTRY* search = SamEntryFromDataA(User, UserLength, Domain, DomainLength); WINPR_SAM_ENTRY* entry = (WINPR_SAM_ENTRY*)calloc(1, sizeof(WINPR_SAM_ENTRY)); diff --git a/winpr/libwinpr/utils/stream.c b/winpr/libwinpr/utils/stream.c index 86f316f32..62b304f9d 100644 --- a/winpr/libwinpr/utils/stream.c +++ b/winpr/libwinpr/utils/stream.c @@ -46,10 +46,10 @@ BOOL Stream_EnsureCapacity(wStream* s, size_t size) WINPR_ASSERT(s); if (s->capacity < size) { - size_t position; - size_t old_capacity; - size_t new_capacity; - BYTE* new_buf; + size_t position = 0; + size_t old_capacity = 0; + size_t new_capacity = 0; + BYTE* new_buf = NULL; old_capacity = s->capacity; new_capacity = old_capacity; @@ -93,7 +93,7 @@ BOOL Stream_EnsureRemainingCapacity(wStream* s, size_t size) wStream* Stream_New(BYTE* buffer, size_t size) { - wStream* s; + wStream* s = NULL; if (!buffer && !size) return NULL; @@ -155,7 +155,7 @@ wStream* Stream_StaticInit(wStream* s, BYTE* buffer, size_t size) void Stream_EnsureValidity(wStream* s) { - size_t cur; + size_t cur = 0; STREAM_ASSERT(s); STREAM_ASSERT(s->pointer >= s->buffer); @@ -202,7 +202,7 @@ BOOL Stream_SetPosition(wStream* _s, size_t _p) void Stream_SealLength(wStream* _s) { - size_t cur; + size_t cur = 0; WINPR_ASSERT(_s); WINPR_ASSERT(_s->buffer <= _s->pointer); cur = (size_t)(_s->pointer - _s->buffer); @@ -250,7 +250,7 @@ void Stream_SetCapacity(wStream* _s, size_t _c) size_t Stream_GetRemainingCapacity(const wStream* _s) { - size_t cur; + size_t cur = 0; WINPR_ASSERT(_s); WINPR_ASSERT(_s->buffer <= _s->pointer); cur = (size_t)(_s->pointer - _s->buffer); @@ -266,7 +266,7 @@ size_t Stream_GetRemainingCapacity(const wStream* _s) size_t Stream_GetRemainingLength(const wStream* _s) { - size_t cur; + size_t cur = 0; WINPR_ASSERT(_s); WINPR_ASSERT(_s->buffer <= _s->pointer); WINPR_ASSERT(_s->length <= _s->capacity); @@ -283,7 +283,7 @@ size_t Stream_GetRemainingLength(const wStream* _s) BOOL Stream_Write_UTF16_String(wStream* s, const WCHAR* src, size_t length) { - size_t x; + size_t x = 0; WINPR_ASSERT(s); WINPR_ASSERT(src || (length == 0)); @@ -301,7 +301,7 @@ BOOL Stream_Write_UTF16_String(wStream* s, const WCHAR* src, size_t length) BOOL Stream_Read_UTF16_String(wStream* s, WCHAR* dst, size_t length) { - size_t x; + size_t x = 0; WINPR_ASSERT(s); WINPR_ASSERT(dst); diff --git a/winpr/libwinpr/utils/strlst.c b/winpr/libwinpr/utils/strlst.c index 5479d6286..18c38c607 100644 --- a/winpr/libwinpr/utils/strlst.c +++ b/winpr/libwinpr/utils/strlst.c @@ -27,7 +27,7 @@ void string_list_free(char** string_list) { - int i; + int i = 0; for (i = 0; string_list[i]; i++) { @@ -39,7 +39,7 @@ void string_list_free(char** string_list) int string_list_length(const char* const* string_list) { - int i; + int i = 0; for (i = 0; string_list[i]; i++) ; @@ -49,7 +49,7 @@ int string_list_length(const char* const* string_list) char** string_list_copy(const char* const* string_list) { - int i; + int i = 0; int length = string_list_length(string_list); char** copy = calloc(length + 1, sizeof(char*)); @@ -69,7 +69,7 @@ char** string_list_copy(const char* const* string_list) void string_list_print(FILE* out, const char* const* string_list) { - int j; + int j = 0; for (j = 0; string_list[j]; j++) { diff --git a/winpr/libwinpr/utils/test/TestASN1.c b/winpr/libwinpr/utils/test/TestASN1.c index b06c67715..6db0e94ae 100644 --- a/winpr/libwinpr/utils/test/TestASN1.c +++ b/winpr/libwinpr/utils/test/TestASN1.c @@ -31,14 +31,14 @@ int TestASN1Read(int argc, char* argv[]) WinPrAsn1Decoder decoder; WinPrAsn1Decoder seqDecoder; wStream staticS; - WinPrAsn1_BOOL boolV; - WinPrAsn1_INTEGER integerV; + WinPrAsn1_BOOL boolV = 0; + WinPrAsn1_INTEGER integerV = 0; WinPrAsn1_OID oidV; - WinPrAsn1_IA5STRING ia5stringV; + WinPrAsn1_IA5STRING ia5stringV = NULL; WinPrAsn1_UTCTIME utctimeV; - WinPrAsn1_tag tag; - size_t len; - BOOL error; + WinPrAsn1_tag tag = 0; + size_t len = 0; + BOOL error = 0; /* ============== Test INTEGERs ================ */ Stream_StaticConstInit(&staticS, integerContent, sizeof(integerContent)); @@ -141,12 +141,12 @@ static WinPrAsn1_OID oid4 = { sizeof(oid4_val), oid4_val }; int TestASN1Write(int argc, char* argv[]) { - size_t i; + size_t i = 0; wStream* s = NULL; - size_t expectedOuputSz; + size_t expectedOuputSz = 0; int retCode = 100; WinPrAsn1_UTCTIME utcTime; - WinPrAsn1_IA5STRING ia5string; + WinPrAsn1_IA5STRING ia5string = NULL; WinPrAsn1Encoder* enc = WinPrAsn1Encoder_New(WINPR_ASN1_DER); if (!enc) goto out; diff --git a/winpr/libwinpr/utils/test/TestArrayList.c b/winpr/libwinpr/utils/test/TestArrayList.c index 4a0d2740d..b2c3a331a 100644 --- a/winpr/libwinpr/utils/test/TestArrayList.c +++ b/winpr/libwinpr/utils/test/TestArrayList.c @@ -5,11 +5,11 @@ int TestArrayList(int argc, char* argv[]) { - size_t index; - int count; - int rc; - size_t val; - wArrayList* arrayList; + size_t index = 0; + int count = 0; + int rc = 0; + size_t val = 0; + wArrayList* arrayList = NULL; const size_t elemsToInsert = 10; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/utils/test/TestBacktrace.c b/winpr/libwinpr/utils/test/TestBacktrace.c index 7c9039af1..a6855acb5 100644 --- a/winpr/libwinpr/utils/test/TestBacktrace.c +++ b/winpr/libwinpr/utils/test/TestBacktrace.c @@ -4,9 +4,9 @@ int TestBacktrace(int argc, char* argv[]) { int rc = -1; - size_t used; - size_t x; - char** msg; + size_t used = 0; + size_t x = 0; + char** msg = NULL; void* stack = winpr_backtrace(20); WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/utils/test/TestBitStream.c b/winpr/libwinpr/utils/test/TestBitStream.c index 268a005d0..e4390e863 100644 --- a/winpr/libwinpr/utils/test/TestBitStream.c +++ b/winpr/libwinpr/utils/test/TestBitStream.c @@ -6,8 +6,8 @@ static void BitStrGen(void) { - DWORD i; - DWORD j; + DWORD i = 0; + DWORD j = 0; char str[64]; for (i = 0; i < 256;) @@ -53,7 +53,7 @@ static void BitStrGen(void) int TestBitStream(int argc, char* argv[]) { - wBitStream* bs; + wBitStream* bs = NULL; BYTE buffer[1024] = { 0 }; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/utils/test/TestBufferPool.c b/winpr/libwinpr/utils/test/TestBufferPool.c index 29e57c2f3..d954caaf9 100644 --- a/winpr/libwinpr/utils/test/TestBufferPool.c +++ b/winpr/libwinpr/utils/test/TestBufferPool.c @@ -5,9 +5,9 @@ int TestBufferPool(int argc, char* argv[]) { - DWORD PoolSize; - int BufferSize; - wBufferPool* pool; + DWORD PoolSize = 0; + int BufferSize = 0; + wBufferPool* pool = NULL; BYTE* Buffers[10]; int DefaultSize = 1234; diff --git a/winpr/libwinpr/utils/test/TestCmdLine.c b/winpr/libwinpr/utils/test/TestCmdLine.c index 1ce3d49d1..5aebdb64e 100644 --- a/winpr/libwinpr/utils/test/TestCmdLine.c +++ b/winpr/libwinpr/utils/test/TestCmdLine.c @@ -76,7 +76,7 @@ static BOOL checkResult(size_t index, char** actual, size_t actualCount) } else { - size_t x; + size_t x = 0; if (!actual) return FALSE; @@ -96,7 +96,7 @@ static BOOL checkResult(size_t index, char** actual, size_t actualCount) static BOOL TestCommandLineParseCommaSeparatedValuesEx(void) { - size_t x; + size_t x = 0; WINPR_ASSERT(ARRAYSIZE(testListArgs) == ARRAYSIZE(testListArgsResult)); WINPR_ASSERT(ARRAYSIZE(testListArgs) == ARRAYSIZE(testListArgsCount)); @@ -117,14 +117,14 @@ static BOOL TestCommandLineParseCommaSeparatedValuesEx(void) int TestCmdLine(int argc, char* argv[]) { - int status; + int status = 0; int ret = -1; - DWORD flags; + DWORD flags = 0; long width = 0; long height = 0; - const COMMAND_LINE_ARGUMENT_A* arg; - int testArgc; - char** command_line; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; + int testArgc = 0; + char** command_line = NULL; COMMAND_LINE_ARGUMENT_A args[] = { { "v", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, NULL, -1, NULL, "destination server" }, { "port", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, NULL, -1, NULL, "server port" }, @@ -305,8 +305,8 @@ int TestCmdLine(int argc, char* argv[]) } CommandLineSwitchCase(arg, "valuelist") { - char** p; - size_t count; + char** p = NULL; + size_t count = 0; p = CommandLineParseCommaSeparatedValuesEx(arg->Name, arg->Value, &count); free(p); @@ -320,8 +320,8 @@ int TestCmdLine(int argc, char* argv[]) } CommandLineSwitchCase(arg, "valuelist-empty") { - char** p; - size_t count; + char** p = NULL; + size_t count = 0; p = CommandLineParseCommaSeparatedValuesEx(arg->Name, arg->Value, &count); free(p); diff --git a/winpr/libwinpr/utils/test/TestHashTable.c b/winpr/libwinpr/utils/test/TestHashTable.c index f63a799ca..764853f5d 100644 --- a/winpr/libwinpr/utils/test/TestHashTable.c +++ b/winpr/libwinpr/utils/test/TestHashTable.c @@ -14,9 +14,9 @@ static char* val3 = "val3"; static int test_hash_table_pointer(void) { int rc = -1; - size_t count; - char* value; - wHashTable* table; + size_t count = 0; + char* value = NULL; + wHashTable* table = NULL; table = HashTable_New(TRUE); if (!table) @@ -150,8 +150,8 @@ fail: static int test_hash_table_string(void) { int rc = -1; - size_t count; - char* value; + size_t count = 0; + char* value = NULL; wHashTable* table = HashTable_New(TRUE); if (!table) @@ -370,7 +370,7 @@ static BOOL foreachFn3(const void* key, void* value, void* arg) static int test_hash_foreach(void) { ForeachData foreachData; - wHashTable* table; + wHashTable* table = NULL; int retCode = 0; foreachData.table = table = HashTable_New(TRUE); diff --git a/winpr/libwinpr/utils/test/TestIni.c b/winpr/libwinpr/utils/test/TestIni.c index ed750a421..2dd24f0e7 100644 --- a/winpr/libwinpr/utils/test/TestIni.c +++ b/winpr/libwinpr/utils/test/TestIni.c @@ -39,11 +39,11 @@ static const char TEST_INI_03[] = "[FreeRDS]\n" int TestIni(int argc, char* argv[]) { int rc = -1; - size_t nKeys; - size_t nSections; - UINT32 iValue; + size_t nKeys = 0; + size_t nSections = 0; + UINT32 iValue = 0; wIniFile* ini = NULL; - const char* sValue; + const char* sValue = NULL; char** keyNames = NULL; char** sectionNames = NULL; diff --git a/winpr/libwinpr/utils/test/TestListDictionary.c b/winpr/libwinpr/utils/test/TestListDictionary.c index 2f4845019..7be8013a4 100644 --- a/winpr/libwinpr/utils/test/TestListDictionary.c +++ b/winpr/libwinpr/utils/test/TestListDictionary.c @@ -13,9 +13,9 @@ static char* val3 = "val3"; int TestListDictionary(int argc, char* argv[]) { - size_t count; - char* value; - wListDictionary* list; + size_t count = 0; + char* value = NULL; + wListDictionary* list = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/utils/test/TestMessageQueue.c b/winpr/libwinpr/utils/test/TestMessageQueue.c index eb1cf1cff..b3245b1d3 100644 --- a/winpr/libwinpr/utils/test/TestMessageQueue.c +++ b/winpr/libwinpr/utils/test/TestMessageQueue.c @@ -24,8 +24,8 @@ static DWORD WINAPI message_queue_consumer_thread(LPVOID arg) int TestMessageQueue(int argc, char* argv[]) { - HANDLE thread; - wMessageQueue* queue; + HANDLE thread = NULL; + wMessageQueue* queue = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/utils/test/TestPrint.c b/winpr/libwinpr/utils/test/TestPrint.c index 9f04574ac..955adfd84 100644 --- a/winpr/libwinpr/utils/test/TestPrint.c +++ b/winpr/libwinpr/utils/test/TestPrint.c @@ -1,4 +1,5 @@ +#include #include #include #include @@ -302,10 +303,10 @@ fail: int TestPrint(int argc, char* argv[]) { - int a; - int b; - float c; - float d; + int a = 0; + int b = 0; + float c = NAN; + float d = NAN; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/utils/test/TestPubSub.c b/winpr/libwinpr/utils/test/TestPubSub.c index 18157d931..0b05b15c5 100644 --- a/winpr/libwinpr/utils/test/TestPubSub.c +++ b/winpr/libwinpr/utils/test/TestPubSub.c @@ -32,7 +32,7 @@ static wEventType Node_Events[] = { DEFINE_EVENT_ENTRY(MouseMotion), int TestPubSub(int argc, char* argv[]) { - wPubSub* node; + wPubSub* node = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/utils/test/TestQueue.c b/winpr/libwinpr/utils/test/TestQueue.c index bcb288423..396055d4f 100644 --- a/winpr/libwinpr/utils/test/TestQueue.c +++ b/winpr/libwinpr/utils/test/TestQueue.c @@ -5,10 +5,10 @@ int TestQueue(int argc, char* argv[]) { - size_t item; - size_t index; - size_t count; - wQueue* queue; + size_t item = 0; + size_t index = 0; + size_t count = 0; + wQueue* queue = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/utils/test/TestStream.c b/winpr/libwinpr/utils/test/TestStream.c index 947c26cf2..8f344a736 100644 --- a/winpr/libwinpr/utils/test/TestStream.c +++ b/winpr/libwinpr/utils/test/TestStream.c @@ -92,7 +92,7 @@ static BOOL TestStream_Static(void) BYTE buffer[20]; wStream staticStream; wStream* s = &staticStream; - UINT16 v; + UINT16 v = 0; /* Test creation of a static stream */ Stream_StaticInit(s, buffer, sizeof(buffer)); Stream_Write_UINT16(s, 0xcab1); @@ -130,10 +130,10 @@ static BOOL TestStream_Static(void) static BOOL TestStream_Create(size_t count, BOOL selfAlloc) { - size_t i; - size_t len; - size_t cap; - size_t pos; + size_t i = 0; + size_t len = 0; + size_t cap = 0; + size_t pos = 0; wStream* s = NULL; void* buffer = NULL; @@ -202,7 +202,7 @@ fail: static BOOL TestStream_Extent(UINT32 maxSize) { - UINT32 i; + UINT32 i = 0; wStream* s = NULL; BOOL result = FALSE; @@ -322,10 +322,10 @@ static BOOL TestStream_Reading(void) static BOOL TestStream_Write(void) { BOOL rc = FALSE; - UINT8 u8; - UINT16 u16; - UINT32 u32; - UINT64 u64; + UINT8 u8 = 0; + UINT16 u16 = 0; + UINT32 u32 = 0; + UINT64 u64 = 0; const BYTE data[] = "someteststreamdata"; wStream* s = Stream_New(NULL, 100); @@ -504,7 +504,7 @@ out: static BOOL TestStream_Zero(void) { - UINT32 x; + UINT32 x = 0; BOOL rc = FALSE; const BYTE data[] = "someteststreamdata"; wStream* s = Stream_New(NULL, sizeof(data)); @@ -537,7 +537,7 @@ static BOOL TestStream_Zero(void) for (x = 0; x < 5; x++) { - UINT8 val; + UINT8 val = 0; Stream_Read_UINT8(s, val); if (val != 0) diff --git a/winpr/libwinpr/utils/test/TestStreamPool.c b/winpr/libwinpr/utils/test/TestStreamPool.c index 146755b6e..8dc4dc1e4 100644 --- a/winpr/libwinpr/utils/test/TestStreamPool.c +++ b/winpr/libwinpr/utils/test/TestStreamPool.c @@ -8,7 +8,7 @@ int TestStreamPool(int argc, char* argv[]) { wStream* s[5]; - wStreamPool* pool; + wStreamPool* pool = NULL; char buffer[8192]; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/utils/test/TestVersion.c b/winpr/libwinpr/utils/test/TestVersion.c index b6828f281..71a1d74d9 100644 --- a/winpr/libwinpr/utils/test/TestVersion.c +++ b/winpr/libwinpr/utils/test/TestVersion.c @@ -6,9 +6,9 @@ int TestVersion(int argc, char* argv[]) { - const char* version; - const char* git; - const char* build; + const char* version = NULL; + const char* git = NULL; + const char* build = NULL; int major = 0; int minor = 0; int revision = 0; diff --git a/winpr/libwinpr/utils/test/TestWLog.c b/winpr/libwinpr/utils/test/TestWLog.c index 36ef8cd22..92f11147e 100644 --- a/winpr/libwinpr/utils/test/TestWLog.c +++ b/winpr/libwinpr/utils/test/TestWLog.c @@ -6,11 +6,11 @@ int TestWLog(int argc, char* argv[]) { - wLog* root; - wLog* logA; - wLog* logB; - wLogLayout* layout; - wLogAppender* appender; + wLog* root = NULL; + wLog* logA = NULL; + wLog* logB = NULL; + wLogLayout* layout = NULL; + wLogAppender* appender = NULL; char* tmp_path = NULL; char* wlog_file = NULL; int result = 1; diff --git a/winpr/libwinpr/utils/test/TestWLogCallback.c b/winpr/libwinpr/utils/test/TestWLogCallback.c index df4a6c619..1acbf6586 100644 --- a/winpr/libwinpr/utils/test/TestWLogCallback.c +++ b/winpr/libwinpr/utils/test/TestWLogCallback.c @@ -76,11 +76,11 @@ static BOOL CallbackAppenderPackage(const wLogMessage* msg) int TestWLogCallback(int argc, char* argv[]) { - wLog* root; - wLog* logA; - wLog* logB; - wLogLayout* layout; - wLogAppender* appender; + wLog* root = NULL; + wLog* logA = NULL; + wLog* logB = NULL; + wLogLayout* layout = NULL; + wLogAppender* appender = NULL; wLogCallbacks callbacks; WINPR_UNUSED(argc); diff --git a/winpr/libwinpr/utils/unwind/debug.c b/winpr/libwinpr/utils/unwind/debug.c index dbc85f7b2..a787bfaf8 100644 --- a/winpr/libwinpr/utils/unwind/debug.c +++ b/winpr/libwinpr/utils/unwind/debug.c @@ -62,7 +62,7 @@ static _Unwind_Reason_Code unwind_backtrace_callback(struct _Unwind_Context* con void* winpr_unwind_backtrace(DWORD size) { - _Unwind_Reason_Code rc; + _Unwind_Reason_Code rc = _URC_FOREIGN_EXCEPTION_CAUGHT; unwind_context_t* ctx = calloc(1, sizeof(unwind_context_t)); if (!ctx) goto fail; @@ -94,7 +94,7 @@ void winpr_unwind_backtrace_free(void* buffer) char** winpr_unwind_backtrace_symbols(void* buffer, size_t* used) { - size_t x; + size_t x = 0; union { char* cp; diff --git a/winpr/libwinpr/utils/wlog/Appender.c b/winpr/libwinpr/utils/wlog/Appender.c index d56c2b2fe..a1cbbd66a 100644 --- a/winpr/libwinpr/utils/wlog/Appender.c +++ b/winpr/libwinpr/utils/wlog/Appender.c @@ -50,7 +50,7 @@ wLogAppender* WLog_GetLogAppender(wLog* log) BOOL WLog_OpenAppender(wLog* log) { int status = 0; - wLogAppender* appender; + wLogAppender* appender = NULL; appender = WLog_GetLogAppender(log); @@ -72,7 +72,7 @@ BOOL WLog_OpenAppender(wLog* log) BOOL WLog_CloseAppender(wLog* log) { int status = 0; - wLogAppender* appender; + wLogAppender* appender = NULL; appender = WLog_GetLogAppender(log); @@ -93,7 +93,7 @@ BOOL WLog_CloseAppender(wLog* log) static wLogAppender* WLog_Appender_New(wLog* log, DWORD logAppenderType) { - wLogAppender* appender; + wLogAppender* appender = NULL; if (!log) return NULL; diff --git a/winpr/libwinpr/utils/wlog/BinaryAppender.c b/winpr/libwinpr/utils/wlog/BinaryAppender.c index b5b3c9344..e9a440a26 100644 --- a/winpr/libwinpr/utils/wlog/BinaryAppender.c +++ b/winpr/libwinpr/utils/wlog/BinaryAppender.c @@ -40,7 +40,7 @@ typedef struct static BOOL WLog_BinaryAppender_Open(wLog* log, wLogAppender* appender) { - wLogBinaryAppender* binaryAppender; + wLogBinaryAppender* binaryAppender = NULL; if (!log || !appender) return FALSE; @@ -85,7 +85,7 @@ static BOOL WLog_BinaryAppender_Open(wLog* log, wLogAppender* appender) static BOOL WLog_BinaryAppender_Close(wLog* log, wLogAppender* appender) { - wLogBinaryAppender* binaryAppender; + wLogBinaryAppender* binaryAppender = NULL; if (!appender) return FALSE; @@ -105,14 +105,14 @@ static BOOL WLog_BinaryAppender_Close(wLog* log, wLogAppender* appender) static BOOL WLog_BinaryAppender_WriteMessage(wLog* log, wLogAppender* appender, wLogMessage* message) { - FILE* fp; - wStream* s; - size_t MessageLength; - size_t FileNameLength; - size_t FunctionNameLength; - size_t TextStringLength; + FILE* fp = NULL; + wStream* s = NULL; + size_t MessageLength = 0; + size_t FileNameLength = 0; + size_t FunctionNameLength = 0; + size_t TextStringLength = 0; BOOL ret = TRUE; - wLogBinaryAppender* binaryAppender; + wLogBinaryAppender* binaryAppender = NULL; if (!log || !appender || !message) return FALSE; @@ -206,7 +206,7 @@ static BOOL WLog_BinaryAppender_Set(wLogAppender* appender, const char* setting, static void WLog_BinaryAppender_Free(wLogAppender* appender) { - wLogBinaryAppender* binaryAppender; + wLogBinaryAppender* binaryAppender = NULL; if (appender) { binaryAppender = (wLogBinaryAppender*)appender; @@ -219,7 +219,7 @@ static void WLog_BinaryAppender_Free(wLogAppender* appender) wLogAppender* WLog_BinaryAppender_New(wLog* log) { - wLogBinaryAppender* BinaryAppender; + wLogBinaryAppender* BinaryAppender = NULL; BinaryAppender = (wLogBinaryAppender*)calloc(1, sizeof(wLogBinaryAppender)); if (!BinaryAppender) diff --git a/winpr/libwinpr/utils/wlog/CallbackAppender.c b/winpr/libwinpr/utils/wlog/CallbackAppender.c index efb2bd214..f324e7c2d 100644 --- a/winpr/libwinpr/utils/wlog/CallbackAppender.c +++ b/winpr/libwinpr/utils/wlog/CallbackAppender.c @@ -42,7 +42,7 @@ static BOOL WLog_CallbackAppender_WriteMessage(wLog* log, wLogAppender* appender wLogMessage* message) { char prefix[WLOG_MAX_PREFIX_SIZE] = { 0 }; - wLogCallbackAppender* callbackAppender; + wLogCallbackAppender* callbackAppender = NULL; if (!appender) return FALSE; @@ -62,7 +62,7 @@ static BOOL WLog_CallbackAppender_WriteDataMessage(wLog* log, wLogAppender* appe wLogMessage* message) { char prefix[WLOG_MAX_PREFIX_SIZE] = { 0 }; - wLogCallbackAppender* callbackAppender; + wLogCallbackAppender* callbackAppender = NULL; if (!appender) return FALSE; @@ -81,7 +81,7 @@ static BOOL WLog_CallbackAppender_WriteImageMessage(wLog* log, wLogAppender* app wLogMessage* message) { char prefix[WLOG_MAX_PREFIX_SIZE] = { 0 }; - wLogCallbackAppender* callbackAppender; + wLogCallbackAppender* callbackAppender = NULL; if (!appender) return FALSE; @@ -100,7 +100,7 @@ static BOOL WLog_CallbackAppender_WritePacketMessage(wLog* log, wLogAppender* ap wLogMessage* message) { char prefix[WLOG_MAX_PREFIX_SIZE] = { 0 }; - wLogCallbackAppender* callbackAppender; + wLogCallbackAppender* callbackAppender = NULL; if (!appender) return FALSE; @@ -133,7 +133,7 @@ static BOOL WLog_CallbackAppender_Set(wLogAppender* appender, const char* settin static void WLog_CallbackAppender_Free(wLogAppender* appender) { - wLogCallbackAppender* callbackAppender; + wLogCallbackAppender* callbackAppender = NULL; if (!appender) { return; @@ -147,7 +147,7 @@ static void WLog_CallbackAppender_Free(wLogAppender* appender) wLogAppender* WLog_CallbackAppender_New(wLog* log) { - wLogCallbackAppender* CallbackAppender; + wLogCallbackAppender* CallbackAppender = NULL; CallbackAppender = (wLogCallbackAppender*)calloc(1, sizeof(wLogCallbackAppender)); if (!CallbackAppender) diff --git a/winpr/libwinpr/utils/wlog/ConsoleAppender.c b/winpr/libwinpr/utils/wlog/ConsoleAppender.c index eebc0ee94..0a50ef694 100644 --- a/winpr/libwinpr/utils/wlog/ConsoleAppender.c +++ b/winpr/libwinpr/utils/wlog/ConsoleAppender.c @@ -51,9 +51,9 @@ static BOOL WLog_ConsoleAppender_Close(wLog* log, wLogAppender* appender) static BOOL WLog_ConsoleAppender_WriteMessage(wLog* log, wLogAppender* appender, wLogMessage* message) { - FILE* fp; + FILE* fp = NULL; char prefix[WLOG_MAX_PREFIX_SIZE] = { 0 }; - wLogConsoleAppender* consoleAppender; + wLogConsoleAppender* consoleAppender = NULL; if (!appender) return FALSE; @@ -144,8 +144,8 @@ static BOOL WLog_ConsoleAppender_WriteDataMessage(wLog* log, wLogAppender* appen #if defined(ANDROID) return FALSE; #else - int DataId; - char* FullFileName; + int DataId = 0; + char* FullFileName = NULL; DataId = g_DataId++; FullFileName = WLog_Message_GetOutputFileName(DataId, "dat"); @@ -166,8 +166,8 @@ static BOOL WLog_ConsoleAppender_WriteImageMessage(wLog* log, wLogAppender* appe #if defined(ANDROID) return FALSE; #else - int ImageId; - char* FullFileName; + int ImageId = 0; + char* FullFileName = NULL; ImageId = g_ImageId++; FullFileName = WLog_Message_GetOutputFileName(ImageId, "bmp"); @@ -189,7 +189,7 @@ static BOOL WLog_ConsoleAppender_WritePacketMessage(wLog* log, wLogAppender* app #if defined(ANDROID) return FALSE; #else - char* FullFileName; + char* FullFileName = NULL; g_PacketId++; @@ -247,7 +247,7 @@ static void WLog_ConsoleAppender_Free(wLogAppender* appender) wLogAppender* WLog_ConsoleAppender_New(wLog* log) { - wLogConsoleAppender* ConsoleAppender; + wLogConsoleAppender* ConsoleAppender = NULL; ConsoleAppender = (wLogConsoleAppender*)calloc(1, sizeof(wLogConsoleAppender)); diff --git a/winpr/libwinpr/utils/wlog/DataMessage.c b/winpr/libwinpr/utils/wlog/DataMessage.c index 8d7122905..512fddd23 100644 --- a/winpr/libwinpr/utils/wlog/DataMessage.c +++ b/winpr/libwinpr/utils/wlog/DataMessage.c @@ -30,7 +30,7 @@ BOOL WLog_DataMessage_Write(const char* filename, const void* data, size_t length) { - FILE* fp; + FILE* fp = NULL; BOOL ret = TRUE; fp = winpr_fopen(filename, "w+b"); diff --git a/winpr/libwinpr/utils/wlog/FileAppender.c b/winpr/libwinpr/utils/wlog/FileAppender.c index 56f0707d3..7afc658cf 100644 --- a/winpr/libwinpr/utils/wlog/FileAppender.c +++ b/winpr/libwinpr/utils/wlog/FileAppender.c @@ -59,7 +59,7 @@ static BOOL WLog_FileAppender_SetOutputFilePath(wLogFileAppender* appender, cons static BOOL WLog_FileAppender_Open(wLog* log, wLogAppender* appender) { - wLogFileAppender* fileAppender; + wLogFileAppender* fileAppender = NULL; if (!log || !appender) return FALSE; @@ -111,7 +111,7 @@ static BOOL WLog_FileAppender_Open(wLog* log, wLogAppender* appender) static BOOL WLog_FileAppender_Close(wLog* log, wLogAppender* appender) { - wLogFileAppender* fileAppender; + wLogFileAppender* fileAppender = NULL; if (!log || !appender) return FALSE; @@ -128,9 +128,9 @@ static BOOL WLog_FileAppender_Close(wLog* log, wLogAppender* appender) static BOOL WLog_FileAppender_WriteMessage(wLog* log, wLogAppender* appender, wLogMessage* message) { - FILE* fp; + FILE* fp = NULL; char prefix[WLOG_MAX_PREFIX_SIZE] = { 0 }; - wLogFileAppender* fileAppender; + wLogFileAppender* fileAppender = NULL; if (!log || !appender || !message) return FALSE; @@ -153,8 +153,8 @@ static int g_DataId = 0; static BOOL WLog_FileAppender_WriteDataMessage(wLog* log, wLogAppender* appender, wLogMessage* message) { - int DataId; - char* FullFileName; + int DataId = 0; + char* FullFileName = NULL; if (!log || !appender || !message) return FALSE; @@ -171,8 +171,8 @@ static int g_ImageId = 0; static BOOL WLog_FileAppender_WriteImageMessage(wLog* log, wLogAppender* appender, wLogMessage* message) { - int ImageId; - char* FullFileName; + int ImageId = 0; + char* FullFileName = NULL; if (!log || !appender || !message) return FALSE; @@ -218,10 +218,10 @@ static void WLog_FileAppender_Free(wLogAppender* appender) wLogAppender* WLog_FileAppender_New(wLog* log) { - LPSTR env; - LPCSTR name; - DWORD nSize; - wLogFileAppender* FileAppender; + LPSTR env = NULL; + LPCSTR name = NULL; + DWORD nSize = 0; + wLogFileAppender* FileAppender = NULL; FileAppender = (wLogFileAppender*)calloc(1, sizeof(wLogFileAppender)); if (!FileAppender) @@ -240,7 +240,7 @@ wLogAppender* WLog_FileAppender_New(wLog* log) if (nSize) { - BOOL status; + BOOL status = 0; env = (LPSTR)malloc(nSize); if (!env) diff --git a/winpr/libwinpr/utils/wlog/ImageMessage.c b/winpr/libwinpr/utils/wlog/ImageMessage.c index 40fe713f4..ce600323f 100644 --- a/winpr/libwinpr/utils/wlog/ImageMessage.c +++ b/winpr/libwinpr/utils/wlog/ImageMessage.c @@ -26,7 +26,7 @@ BOOL WLog_ImageMessage_Write(char* filename, void* data, size_t width, size_t height, size_t bpp) { - int status; + int status = 0; status = winpr_bitmap_write(filename, data, width, height, bpp); diff --git a/winpr/libwinpr/utils/wlog/JournaldAppender.c b/winpr/libwinpr/utils/wlog/JournaldAppender.c index 2b79d3d6f..504108bbb 100644 --- a/winpr/libwinpr/utils/wlog/JournaldAppender.c +++ b/winpr/libwinpr/utils/wlog/JournaldAppender.c @@ -38,8 +38,8 @@ typedef struct static BOOL WLog_JournaldAppender_Open(wLog* log, wLogAppender* appender) { - int fd; - wLogJournaldAppender* journaldAppender; + int fd = 0; + wLogJournaldAppender* journaldAppender = NULL; if (!log || !appender) return FALSE; @@ -74,8 +74,8 @@ static BOOL WLog_JournaldAppender_Close(wLog* log, wLogAppender* appender) static BOOL WLog_JournaldAppender_WriteMessage(wLog* log, wLogAppender* appender, wLogMessage* message) { - char* formatStr; - wLogJournaldAppender* journaldAppender; + char* formatStr = NULL; + wLogJournaldAppender* journaldAppender = NULL; char prefix[WLOG_MAX_PREFIX_SIZE] = { 0 }; if (!log || !appender || !message) @@ -157,7 +157,7 @@ static BOOL WLog_JournaldAppender_Set(wLogAppender* appender, const char* settin static void WLog_JournaldAppender_Free(wLogAppender* appender) { - wLogJournaldAppender* journaldAppender; + wLogJournaldAppender* journaldAppender = NULL; if (appender) { journaldAppender = (wLogJournaldAppender*)appender; @@ -170,8 +170,8 @@ static void WLog_JournaldAppender_Free(wLogAppender* appender) wLogAppender* WLog_JournaldAppender_New(wLog* log) { - wLogJournaldAppender* appender; - DWORD nSize; + wLogJournaldAppender* appender = NULL; + DWORD nSize = 0; LPCSTR name = "WLOG_JOURNALD_ID"; appender = (wLogJournaldAppender*)calloc(1, sizeof(wLogJournaldAppender)); diff --git a/winpr/libwinpr/utils/wlog/Layout.c b/winpr/libwinpr/utils/wlog/Layout.c index 393315e9f..60a33da28 100644 --- a/winpr/libwinpr/utils/wlog/Layout.c +++ b/winpr/libwinpr/utils/wlog/Layout.c @@ -91,7 +91,7 @@ static void WLog_PrintMessagePrefix(wLog* log, wLogMessage* message, static const char* get_tid(void* arg) { char* str = arg; - size_t tid; + size_t tid = 0; #if defined __linux__ && !defined ANDROID /* On Linux we prefer to see the LWP id */ tid = (size_t)syscall(SYS_gettid); @@ -302,7 +302,7 @@ BOOL WLog_Layout_GetMessagePrefix(wLog* log, wLogLayout* layout, wLogMessage* me wLogLayout* WLog_GetLogLayout(wLog* log) { - wLogAppender* appender; + wLogAppender* appender = NULL; appender = WLog_GetLogAppender(log); return appender->Layout; } @@ -326,9 +326,9 @@ BOOL WLog_Layout_SetPrefixFormat(wLog* log, wLogLayout* layout, const char* form wLogLayout* WLog_Layout_New(wLog* log) { LPCSTR prefix = "WLOG_PREFIX"; - DWORD nSize; + DWORD nSize = 0; char* env = NULL; - wLogLayout* layout; + wLogLayout* layout = NULL; layout = (wLogLayout*)calloc(1, sizeof(wLogLayout)); if (!layout) diff --git a/winpr/libwinpr/utils/wlog/Message.c b/winpr/libwinpr/utils/wlog/Message.c index aa39cab37..bedb5edbb 100644 --- a/winpr/libwinpr/utils/wlog/Message.c +++ b/winpr/libwinpr/utils/wlog/Message.c @@ -29,10 +29,10 @@ char* WLog_Message_GetOutputFileName(int id, const char* ext) { - DWORD ProcessId; - char* FilePath; - char* FileName; - char* FullFileName; + DWORD ProcessId = 0; + char* FilePath = NULL; + char* FileName = NULL; + char* FullFileName = NULL; if (!(FileName = (char*)malloc(256))) return NULL; diff --git a/winpr/libwinpr/utils/wlog/PacketMessage.c b/winpr/libwinpr/utils/wlog/PacketMessage.c index 3d5da5894..cc1c812a8 100644 --- a/winpr/libwinpr/utils/wlog/PacketMessage.c +++ b/winpr/libwinpr/utils/wlog/PacketMessage.c @@ -266,7 +266,7 @@ void Pcap_Close(wPcap* pcap) static BOOL WLog_PacketMessage_Write_EthernetHeader(wPcap* pcap, wEthernetHeader* ethernet) { - wStream* s; + wStream* s = NULL; wStream sbuffer = { 0 }; BYTE buffer[14] = { 0 }; BOOL ret = TRUE; @@ -288,7 +288,7 @@ static BOOL WLog_PacketMessage_Write_EthernetHeader(wPcap* pcap, wEthernetHeader static UINT16 IPv4Checksum(BYTE* ipv4, int length) { - UINT16 tmp16; + UINT16 tmp16 = 0; long checksum = 0; while (length > 1) @@ -310,7 +310,7 @@ static UINT16 IPv4Checksum(BYTE* ipv4, int length) static BOOL WLog_PacketMessage_Write_IPv4Header(wPcap* pcap, wIPv4Header* ipv4) { - wStream* s; + wStream* s = NULL; wStream sbuffer = { 0 }; BYTE buffer[20] = { 0 }; int ret = TRUE; @@ -343,7 +343,7 @@ static BOOL WLog_PacketMessage_Write_IPv4Header(wPcap* pcap, wIPv4Header* ipv4) static BOOL WLog_PacketMessage_Write_TcpHeader(wPcap* pcap, wTcpHeader* tcp) { - wStream* s; + wStream* s = NULL; wStream sbuffer = { 0 }; BYTE buffer[20] = { 0 }; BOOL ret = TRUE; diff --git a/winpr/libwinpr/utils/wlog/SyslogAppender.c b/winpr/libwinpr/utils/wlog/SyslogAppender.c index b97636a6f..73baade74 100644 --- a/winpr/libwinpr/utils/wlog/SyslogAppender.c +++ b/winpr/libwinpr/utils/wlog/SyslogAppender.c @@ -68,7 +68,7 @@ static BOOL WLog_SyslogAppender_Close(wLog* log, wLogAppender* appender) static BOOL WLog_SyslogAppender_WriteMessage(wLog* log, wLogAppender* appender, wLogMessage* message) { - int syslogLevel; + int syslogLevel = 0; if (!log || !appender || !message) return FALSE; @@ -83,7 +83,7 @@ static BOOL WLog_SyslogAppender_WriteMessage(wLog* log, wLogAppender* appender, static BOOL WLog_SyslogAppender_WriteDataMessage(wLog* log, wLogAppender* appender, wLogMessage* message) { - int syslogLevel; + int syslogLevel = 0; if (!log || !appender || !message) return FALSE; @@ -98,7 +98,7 @@ static BOOL WLog_SyslogAppender_WriteDataMessage(wLog* log, wLogAppender* append static BOOL WLog_SyslogAppender_WriteImageMessage(wLog* log, wLogAppender* appender, wLogMessage* message) { - int syslogLevel; + int syslogLevel = 0; if (!log || !appender || !message) return FALSE; @@ -118,7 +118,7 @@ static void WLog_SyslogAppender_Free(wLogAppender* appender) wLogAppender* WLog_SyslogAppender_New(wLog* log) { - wLogSyslogAppender* appender; + wLogSyslogAppender* appender = NULL; appender = (wLogSyslogAppender*)calloc(1, sizeof(wLogSyslogAppender)); if (!appender) diff --git a/winpr/libwinpr/utils/wlog/UdpAppender.c b/winpr/libwinpr/utils/wlog/UdpAppender.c index c84abf8c1..19501dc98 100644 --- a/winpr/libwinpr/utils/wlog/UdpAppender.c +++ b/winpr/libwinpr/utils/wlog/UdpAppender.c @@ -37,13 +37,13 @@ typedef struct static BOOL WLog_UdpAppender_Open(wLog* log, wLogAppender* appender) { - wLogUdpAppender* udpAppender; + wLogUdpAppender* udpAppender = NULL; char addressString[256] = { 0 }; struct addrinfo hints = { 0 }; struct addrinfo* result = { 0 }; - int status; - size_t addrLen; - char* colonPos; + int status = 0; + size_t addrLen = 0; + char* colonPos = NULL; if (!appender) return FALSE; @@ -91,7 +91,7 @@ static BOOL WLog_UdpAppender_Close(wLog* log, wLogAppender* appender) static BOOL WLog_UdpAppender_WriteMessage(wLog* log, wLogAppender* appender, wLogMessage* message) { char prefix[WLOG_MAX_PREFIX_SIZE] = { 0 }; - wLogUdpAppender* udpAppender; + wLogUdpAppender* udpAppender = NULL; if (!log || !appender || !message) return FALSE; @@ -148,7 +148,7 @@ static BOOL WLog_UdpAppender_Set(wLogAppender* appender, const char* setting, vo static void WLog_UdpAppender_Free(wLogAppender* appender) { - wLogUdpAppender* udpAppender; + wLogUdpAppender* udpAppender = NULL; if (appender) { @@ -167,9 +167,9 @@ static void WLog_UdpAppender_Free(wLogAppender* appender) wLogAppender* WLog_UdpAppender_New(wLog* log) { - wLogUdpAppender* appender; - DWORD nSize; - LPCSTR name; + wLogUdpAppender* appender = NULL; + DWORD nSize = 0; + LPCSTR name = NULL; appender = (wLogUdpAppender*)calloc(1, sizeof(wLogUdpAppender)); if (!appender) diff --git a/winpr/libwinpr/utils/wlog/wlog.c b/winpr/libwinpr/utils/wlog/wlog.c index 8f535aeb0..25253732f 100644 --- a/winpr/libwinpr/utils/wlog/wlog.c +++ b/winpr/libwinpr/utils/wlog/wlog.c @@ -77,7 +77,7 @@ static void WLog_Uninit_(void) __attribute__((destructor)); static void WLog_Uninit_(void) { - DWORD index; + DWORD index = 0; wLog* child = NULL; wLog* root = g_RootLog; @@ -108,9 +108,9 @@ static void WLog_Unlock(wLog* log) static BOOL CALLBACK WLog_InitializeRoot(PINIT_ONCE InitOnce, PVOID Parameter, PVOID* Context) { - char* env; - DWORD nSize; - DWORD logAppenderType; + char* env = NULL; + DWORD nSize = 0; + DWORD logAppenderType = 0; LPCSTR appender = "WLOG_APPENDER"; WINPR_UNUSED(InitOnce); @@ -179,8 +179,8 @@ static BOOL log_recursion(LPCSTR file, LPCSTR fkt, size_t line) { BOOL status = FALSE; char** msg = NULL; - size_t used; - size_t i; + size_t used = 0; + size_t i = 0; void* bt = winpr_backtrace(20); #if defined(ANDROID) LPCSTR tag = WINPR_TAG("utils.wlog"); @@ -229,7 +229,7 @@ out: static BOOL WLog_Write(wLog* log, wLogMessage* message) { BOOL status = FALSE; - wLogAppender* appender; + wLogAppender* appender = NULL; appender = WLog_GetLogAppender(log); if (!appender) @@ -259,8 +259,8 @@ static BOOL WLog_Write(wLog* log, wLogMessage* message) static BOOL WLog_WriteData(wLog* log, wLogMessage* message) { - BOOL status; - wLogAppender* appender; + BOOL status = 0; + wLogAppender* appender = NULL; appender = WLog_GetLogAppender(log); if (!appender) @@ -290,8 +290,8 @@ static BOOL WLog_WriteData(wLog* log, wLogMessage* message) static BOOL WLog_WriteImage(wLog* log, wLogMessage* message) { - BOOL status; - wLogAppender* appender; + BOOL status = 0; + wLogAppender* appender = NULL; appender = WLog_GetLogAppender(log); if (!appender) @@ -321,8 +321,8 @@ static BOOL WLog_WriteImage(wLog* log, wLogMessage* message) static BOOL WLog_WritePacket(wLog* log, wLogMessage* message) { - BOOL status; - wLogAppender* appender; + BOOL status = 0; + wLogAppender* appender = NULL; appender = WLog_GetLogAppender(log); if (!appender) @@ -416,7 +416,7 @@ BOOL WLog_PrintMessageVA(wLog* log, DWORD type, DWORD level, size_t line, const BOOL WLog_PrintMessage(wLog* log, DWORD type, DWORD level, size_t line, const char* file, const char* function, ...) { - BOOL status; + BOOL status = 0; va_list args; va_start(args, function); status = WLog_PrintMessageVA(log, type, level, line, file, function, args); @@ -442,7 +442,7 @@ DWORD WLog_GetLogLevel(wLog* log) BOOL WLog_IsLevelActive(wLog* _log, DWORD _log_level) { - DWORD level; + DWORD level = 0; if (!_log) return FALSE; @@ -457,7 +457,7 @@ BOOL WLog_IsLevelActive(wLog* _log, DWORD _log_level) BOOL WLog_SetStringLogLevel(wLog* log, LPCSTR level) { - int lvl; + int lvl = 0; if (!log || !level) return FALSE; @@ -472,7 +472,7 @@ BOOL WLog_SetStringLogLevel(wLog* log, LPCSTR level) static BOOL WLog_reset_log_filters(wLog* log) { - DWORD x; + DWORD x = 0; if (!log) return FALSE; @@ -492,8 +492,8 @@ static BOOL WLog_reset_log_filters(wLog* log) static BOOL WLog_AddStringLogFilters_int(wLog* root, LPCSTR filter) { - LPSTR p; - LPCSTR filterStr; + LPSTR p = NULL; + LPCSTR filterStr = NULL; if (!filter) return FALSE; @@ -567,7 +567,7 @@ static BOOL WLog_UpdateInheritLevel(wLog* log, DWORD logLevel) if (log->inherit) { - DWORD x; + DWORD x = 0; log->Level = logLevel; for (x = 0; x < log->ChildrenCount; x++) @@ -584,7 +584,7 @@ static BOOL WLog_UpdateInheritLevel(wLog* log, DWORD logLevel) BOOL WLog_SetLogLevel(wLog* log, DWORD logLevel) { - DWORD x; + DWORD x = 0; if (!log) return FALSE; @@ -633,12 +633,12 @@ int WLog_ParseLogLevel(LPCSTR level) BOOL WLog_ParseFilter(wLog* root, wLogFilter* filter, LPCSTR name) { - const char* pc; - char* p; - char* q; - size_t count; - LPSTR names; - int iLevel; + const char* pc = NULL; + char* p = NULL; + char* q = NULL; + size_t count = 0; + LPSTR names = NULL; + int iLevel = 0; count = 1; WINPR_UNUSED(root); @@ -718,8 +718,8 @@ BOOL WLog_ParseFilters(wLog* root) { LPCSTR filter = "WLOG_FILTER"; BOOL res = FALSE; - char* env; - DWORD nSize; + char* env = NULL; + DWORD nSize = 0; free(g_Filters); g_Filters = NULL; g_FilterCount = 0; @@ -742,8 +742,8 @@ BOOL WLog_ParseFilters(wLog* root) LONG WLog_GetFilterLogLevel(wLog* log) { - DWORD i; - DWORD j; + DWORD i = 0; + DWORD j = 0; BOOL match = FALSE; if (log->FilterLevel >= 0) @@ -787,9 +787,9 @@ LONG WLog_GetFilterLogLevel(wLog* log) static BOOL WLog_ParseName(wLog* log, LPCSTR name) { const char* cp = name; - char* p; + char* p = NULL; size_t count = 1; - LPSTR names; + LPSTR names = NULL; while ((cp = strchr(cp, '.')) != NULL) { @@ -832,8 +832,8 @@ wLog* WLog_New(LPCSTR name, wLog* rootLogger) { wLog* log = NULL; char* env = NULL; - DWORD nSize; - int iLevel; + DWORD nSize = 0; + int iLevel = 0; log = (wLog*)calloc(1, sizeof(wLog)); if (!log) @@ -946,7 +946,7 @@ static BOOL WLog_AddChild(wLog* parent, wLog* child) if (parent->ChildrenCount >= parent->ChildrenSize) { - wLog** tmp; + wLog** tmp = NULL; parent->ChildrenSize *= 2; if (!parent->ChildrenSize) @@ -988,7 +988,7 @@ exit: static wLog* WLog_FindChild(wLog* root, LPCSTR name) { - DWORD index; + DWORD index = 0; wLog* child = NULL; BOOL found = FALSE; @@ -1015,7 +1015,7 @@ static wLog* WLog_FindChild(wLog* root, LPCSTR name) static wLog* WLog_Get_int(wLog* root, LPCSTR name) { - wLog* log; + wLog* log = NULL; if (!(log = WLog_FindChild(root, name))) { @@ -1049,7 +1049,7 @@ BOOL WLog_Init(void) BOOL WLog_Uninit(void) { - DWORD index; + DWORD index = 0; wLog* root = g_RootLog; if (!root) diff --git a/winpr/libwinpr/winsock/winsock.c b/winpr/libwinpr/winsock/winsock.c index f7c738c0e..5a1115fba 100644 --- a/winpr/libwinpr/winsock/winsock.c +++ b/winpr/libwinpr/winsock/winsock.c @@ -737,7 +737,7 @@ BOOL WSAResetEvent(HANDLE hEvent) BOOL WSACloseEvent(HANDLE hEvent) { - BOOL status; + BOOL status = 0; status = CloseHandle(hEvent); if (!status) @@ -778,7 +778,7 @@ DWORD WSAWaitForMultipleEvents(DWORD cEvents, const HANDLE* lphEvents, BOOL fWai SOCKET WSASocketA(int af, int type, int protocol, LPWSAPROTOCOL_INFOA lpProtocolInfo, GROUP g, DWORD dwFlags) { - SOCKET s; + SOCKET s = 0; s = _socket(af, type, protocol); return s; } @@ -793,24 +793,24 @@ int WSAIoctl(SOCKET s, DWORD dwIoControlCode, LPVOID lpvInBuffer, DWORD cbInBuff LPVOID lpvOutBuffer, DWORD cbOutBuffer, LPDWORD lpcbBytesReturned, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - int fd; - int index; - ULONG nFlags; - size_t offset; - size_t ifreq_len; - struct ifreq* ifreq; + int fd = 0; + int index = 0; + ULONG nFlags = 0; + size_t offset = 0; + size_t ifreq_len = 0; + struct ifreq* ifreq = NULL; struct ifconf ifconf; char address[128]; char broadcast[128]; char netmask[128]; char buffer[4096]; - int numInterfaces; - int maxNumInterfaces; - INTERFACE_INFO* pInterface; - INTERFACE_INFO* pInterfaces; - struct sockaddr_in* pAddress; - struct sockaddr_in* pBroadcast; - struct sockaddr_in* pNetmask; + int numInterfaces = 0; + int maxNumInterfaces = 0; + INTERFACE_INFO* pInterface = NULL; + INTERFACE_INFO* pInterfaces = NULL; + struct sockaddr_in* pAddress = NULL; + struct sockaddr_in* pBroadcast = NULL; + struct sockaddr_in* pNetmask = NULL; if ((dwIoControlCode != SIO_GET_INTERFACE_LIST) || (!lpvOutBuffer || !cbOutBuffer || !lpcbBytesReturned)) @@ -1005,7 +1005,7 @@ int WSAIoctl(SOCKET s, DWORD dwIoControlCode, LPVOID lpvInBuffer, DWORD cbInBuff SOCKET _accept(SOCKET s, struct sockaddr* addr, int* addrlen) { - int status; + int status = 0; int fd = (int)s; socklen_t s_addrlen = (socklen_t)*addrlen; status = accept(fd, addr, &s_addrlen); @@ -1015,7 +1015,7 @@ SOCKET _accept(SOCKET s, struct sockaddr* addr, int* addrlen) int _bind(SOCKET s, const struct sockaddr* addr, int namelen) { - int status; + int status = 0; int fd = (int)s; status = bind(fd, addr, (socklen_t)namelen); @@ -1027,7 +1027,7 @@ int _bind(SOCKET s, const struct sockaddr* addr, int namelen) int closesocket(SOCKET s) { - int status; + int status = 0; int fd = (int)s; status = close(fd); return status; @@ -1035,7 +1035,7 @@ int closesocket(SOCKET s) int _connect(SOCKET s, const struct sockaddr* name, int namelen) { - int status; + int status = 0; int fd = (int)s; status = connect(fd, name, (socklen_t)namelen); @@ -1051,7 +1051,7 @@ int _ioctlsocket(SOCKET s, long cmd, u_long* argp) if (cmd == FIONBIO) { - int flags; + int flags = 0; if (!argp) return SOCKET_ERROR; @@ -1072,7 +1072,7 @@ int _ioctlsocket(SOCKET s, long cmd, u_long* argp) int _getpeername(SOCKET s, struct sockaddr* name, int* namelen) { - int status; + int status = 0; int fd = (int)s; socklen_t s_namelen = (socklen_t)*namelen; status = getpeername(fd, name, &s_namelen); @@ -1082,7 +1082,7 @@ int _getpeername(SOCKET s, struct sockaddr* name, int* namelen) int _getsockname(SOCKET s, struct sockaddr* name, int* namelen) { - int status; + int status = 0; int fd = (int)s; socklen_t s_namelen = (socklen_t)*namelen; status = getsockname(fd, name, &s_namelen); @@ -1092,7 +1092,7 @@ int _getsockname(SOCKET s, struct sockaddr* name, int* namelen) int _getsockopt(SOCKET s, int level, int optname, char* optval, int* optlen) { - int status; + int status = 0; int fd = (int)s; socklen_t s_optlen = (socklen_t)*optlen; status = getsockopt(fd, level, optname, (void*)optval, &s_optlen); @@ -1122,7 +1122,7 @@ char* _inet_ntoa(struct in_addr in) int _listen(SOCKET s, int backlog) { - int status; + int status = 0; int fd = (int)s; status = listen(fd, backlog); return status; @@ -1140,7 +1140,7 @@ u_short _ntohs(u_short netshort) int _recv(SOCKET s, char* buf, int len, int flags) { - int status; + int status = 0; int fd = (int)s; status = (int)recv(fd, (void*)buf, (size_t)len, flags); return status; @@ -1148,7 +1148,7 @@ int _recv(SOCKET s, char* buf, int len, int flags) int _recvfrom(SOCKET s, char* buf, int len, int flags, struct sockaddr* from, int* fromlen) { - int status; + int status = 0; int fd = (int)s; socklen_t s_fromlen = (socklen_t)*fromlen; status = (int)recvfrom(fd, (void*)buf, (size_t)len, flags, from, &s_fromlen); @@ -1159,7 +1159,7 @@ int _recvfrom(SOCKET s, char* buf, int len, int flags, struct sockaddr* from, in int _select(int nfds, fd_set* readfds, fd_set* writefds, fd_set* exceptfds, const struct timeval* timeout) { - int status; + int status = 0; union { const struct timeval* cpv; @@ -1176,7 +1176,7 @@ int _select(int nfds, fd_set* readfds, fd_set* writefds, fd_set* exceptfds, int _send(SOCKET s, const char* buf, int len, int flags) { - int status; + int status = 0; int fd = (int)s; flags |= MSG_NOSIGNAL; status = (int)send(fd, (const void*)buf, (size_t)len, flags); @@ -1185,7 +1185,7 @@ int _send(SOCKET s, const char* buf, int len, int flags) int _sendto(SOCKET s, const char* buf, int len, int flags, const struct sockaddr* to, int tolen) { - int status; + int status = 0; int fd = (int)s; status = (int)sendto(fd, (const void*)buf, (size_t)len, flags, to, (socklen_t)tolen); return status; @@ -1193,7 +1193,7 @@ int _sendto(SOCKET s, const char* buf, int len, int flags, const struct sockaddr int _setsockopt(SOCKET s, int level, int optname, const char* optval, int optlen) { - int status; + int status = 0; int fd = (int)s; status = setsockopt(fd, level, optname, (const void*)optval, (socklen_t)optlen); return status; @@ -1201,7 +1201,7 @@ int _setsockopt(SOCKET s, int level, int optname, const char* optval, int optlen int _shutdown(SOCKET s, int how) { - int status; + int status = 0; int fd = (int)s; int s_how = -1; @@ -1229,8 +1229,8 @@ int _shutdown(SOCKET s, int how) SOCKET _socket(int af, int type, int protocol) { - int fd; - SOCKET s; + int fd = 0; + SOCKET s = 0; fd = socket(af, type, protocol); if (fd < 0) @@ -1242,49 +1242,49 @@ SOCKET _socket(int af, int type, int protocol) struct hostent* _gethostbyaddr(const char* addr, int len, int type) { - struct hostent* host; + struct hostent* host = NULL; host = gethostbyaddr((const void*)addr, (socklen_t)len, type); return host; } struct hostent* _gethostbyname(const char* name) { - struct hostent* host; + struct hostent* host = NULL; host = gethostbyname(name); return host; } int _gethostname(char* name, int namelen) { - int status; + int status = 0; status = gethostname(name, (size_t)namelen); return status; } struct servent* _getservbyport(int port, const char* proto) { - struct servent* serv; + struct servent* serv = NULL; serv = getservbyport(port, proto); return serv; } struct servent* _getservbyname(const char* name, const char* proto) { - struct servent* serv; + struct servent* serv = NULL; serv = getservbyname(name, proto); return serv; } struct protoent* _getprotobynumber(int number) { - struct protoent* proto; + struct protoent* proto = NULL; proto = getprotobynumber(number); return proto; } struct protoent* _getprotobyname(const char* name) { - struct protoent* proto; + struct protoent* proto = NULL; proto = getprotobyname(name); return proto; } diff --git a/winpr/libwinpr/wtsapi/test/TestWtsApiEnumerateProcesses.c b/winpr/libwinpr/wtsapi/test/TestWtsApiEnumerateProcesses.c index ebdfbe2df..c6ba8db34 100644 --- a/winpr/libwinpr/wtsapi/test/TestWtsApiEnumerateProcesses.c +++ b/winpr/libwinpr/wtsapi/test/TestWtsApiEnumerateProcesses.c @@ -6,10 +6,10 @@ int TestWtsApiEnumerateProcesses(int argc, char* argv[]) { - DWORD count; - BOOL bSuccess; - HANDLE hServer; - PWTS_PROCESS_INFOA pProcessInfo; + DWORD count = 0; + BOOL bSuccess = 0; + HANDLE hServer = NULL; + PWTS_PROCESS_INFOA pProcessInfo = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/wtsapi/test/TestWtsApiEnumerateSessions.c b/winpr/libwinpr/wtsapi/test/TestWtsApiEnumerateSessions.c index d9f4c7d04..3a43bbffd 100644 --- a/winpr/libwinpr/wtsapi/test/TestWtsApiEnumerateSessions.c +++ b/winpr/libwinpr/wtsapi/test/TestWtsApiEnumerateSessions.c @@ -6,11 +6,11 @@ int TestWtsApiEnumerateSessions(int argc, char* argv[]) { - DWORD index; - DWORD count; - BOOL bSuccess; - HANDLE hServer; - PWTS_SESSION_INFOA pSessionInfo; + DWORD index = 0; + DWORD count = 0; + BOOL bSuccess = 0; + HANDLE hServer = NULL; + PWTS_SESSION_INFOA pSessionInfo = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/wtsapi/test/TestWtsApiQuerySessionInformation.c b/winpr/libwinpr/wtsapi/test/TestWtsApiQuerySessionInformation.c index ee1e30005..9f652f18d 100644 --- a/winpr/libwinpr/wtsapi/test/TestWtsApiQuerySessionInformation.c +++ b/winpr/libwinpr/wtsapi/test/TestWtsApiQuerySessionInformation.c @@ -6,15 +6,15 @@ int TestWtsApiQuerySessionInformation(int argc, char* argv[]) { - DWORD index; - DWORD i; - DWORD count; - BOOL bSuccess; - HANDLE hServer; - LPSTR pBuffer; - DWORD sessionId; - DWORD bytesReturned; - PWTS_SESSION_INFOA pSessionInfo; + DWORD index = 0; + DWORD i = 0; + DWORD count = 0; + BOOL bSuccess = 0; + HANDLE hServer = NULL; + LPSTR pBuffer = NULL; + DWORD sessionId = 0; + DWORD bytesReturned = 0; + PWTS_SESSION_INFOA pSessionInfo = NULL; WINPR_UNUSED(argc); WINPR_UNUSED(argv); @@ -44,16 +44,16 @@ int TestWtsApiQuerySessionInformation(int argc, char* argv[]) for (index = 0; index < count; index++) { - char* Username; - char* Domain; - char* ClientName; - ULONG ClientBuildNumber; - USHORT ClientProductId; - ULONG ClientHardwareId; - USHORT ClientProtocolType; - PWTS_CLIENT_DISPLAY ClientDisplay; - PWTS_CLIENT_ADDRESS ClientAddress; - WTS_CONNECTSTATE_CLASS ConnectState; + char* Username = NULL; + char* Domain = NULL; + char* ClientName = NULL; + ULONG ClientBuildNumber = 0; + USHORT ClientProductId = 0; + ULONG ClientHardwareId = 0; + USHORT ClientProtocolType = 0; + PWTS_CLIENT_DISPLAY ClientDisplay = NULL; + PWTS_CLIENT_ADDRESS ClientAddress = NULL; + WTS_CONNECTSTATE_CLASS ConnectState = WTSInit; pBuffer = NULL; bytesReturned = 0; diff --git a/winpr/libwinpr/wtsapi/test/TestWtsApiSessionNotification.c b/winpr/libwinpr/wtsapi/test/TestWtsApiSessionNotification.c index d2d741ed5..e83c27be3 100644 --- a/winpr/libwinpr/wtsapi/test/TestWtsApiSessionNotification.c +++ b/winpr/libwinpr/wtsapi/test/TestWtsApiSessionNotification.c @@ -7,8 +7,8 @@ int TestWtsApiSessionNotification(int argc, char* argv[]) { HWND hWnd = NULL; - BOOL bSuccess; - DWORD dwFlags; + BOOL bSuccess = 0; + DWORD dwFlags = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/wtsapi/test/TestWtsApiShutdownSystem.c b/winpr/libwinpr/wtsapi/test/TestWtsApiShutdownSystem.c index 6eb763ee8..431424b71 100644 --- a/winpr/libwinpr/wtsapi/test/TestWtsApiShutdownSystem.c +++ b/winpr/libwinpr/wtsapi/test/TestWtsApiShutdownSystem.c @@ -5,9 +5,9 @@ int TestWtsApiShutdownSystem(int argc, char* argv[]) { - BOOL bSuccess; - HANDLE hServer; - DWORD ShutdownFlag; + BOOL bSuccess = 0; + HANDLE hServer = NULL; + DWORD ShutdownFlag = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/wtsapi/test/TestWtsApiWaitSystemEvent.c b/winpr/libwinpr/wtsapi/test/TestWtsApiWaitSystemEvent.c index 1b84c53bd..389c0beb5 100644 --- a/winpr/libwinpr/wtsapi/test/TestWtsApiWaitSystemEvent.c +++ b/winpr/libwinpr/wtsapi/test/TestWtsApiWaitSystemEvent.c @@ -6,10 +6,10 @@ int TestWtsApiWaitSystemEvent(int argc, char* argv[]) { - BOOL bSuccess; - HANDLE hServer; - DWORD eventMask; - DWORD eventFlags; + BOOL bSuccess = 0; + HANDLE hServer = NULL; + DWORD eventMask = 0; + DWORD eventFlags = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/libwinpr/wtsapi/wtsapi.c b/winpr/libwinpr/wtsapi/wtsapi.c index c33c5be8f..46bf9b96a 100644 --- a/winpr/libwinpr/wtsapi/wtsapi.c +++ b/winpr/libwinpr/wtsapi/wtsapi.c @@ -695,7 +695,7 @@ BOOL WTSRegisterWtsApiFunctionTable(const WtsApiFunctionTable* table) static BOOL LoadAndInitialize(char* library) { - INIT_WTSAPI_FN pInitWtsApi; + INIT_WTSAPI_FN pInitWtsApi = NULL; g_WtsApiModule = LoadLibraryX(library); if (!g_WtsApiModule) @@ -714,7 +714,7 @@ static BOOL LoadAndInitialize(char* library) static void InitializeWtsApiStubs_Env(void) { - DWORD nSize; + DWORD nSize = 0; char* env = NULL; LPCSTR wts = "WTSAPI_LIBRARY"; @@ -739,9 +739,9 @@ static void InitializeWtsApiStubs_Env(void) static void InitializeWtsApiStubs_FreeRDS(void) { - wIniFile* ini; - const char* prefix; - const char* libdir; + wIniFile* ini = NULL; + const char* prefix = NULL; + const char* libdir = NULL; if (g_WtsApi) return; @@ -762,8 +762,8 @@ static void InitializeWtsApiStubs_FreeRDS(void) if (prefix && libdir) { - char* prefix_libdir; - char* wtsapi_library; + char* prefix_libdir = NULL; + char* wtsapi_library = NULL; prefix_libdir = GetCombinedPath(prefix, libdir); wtsapi_library = GetCombinedPath(prefix_libdir, FREERDS_LIBRARY_NAME); diff --git a/winpr/test/TestIntrinsics.c b/winpr/test/TestIntrinsics.c index 47917f1b6..2198d6763 100644 --- a/winpr/test/TestIntrinsics.c +++ b/winpr/test/TestIntrinsics.c @@ -13,7 +13,7 @@ static INLINE UINT32 lzcnt_s(UINT32 x) if (!g_LZCNT) { - UINT32 y; + UINT32 y = 0; int n = 32; y = x >> 16; if (y != 0) diff --git a/winpr/test/TestTypes.c b/winpr/test/TestTypes.c index 503658eb1..5a368f694 100644 --- a/winpr/test/TestTypes.c +++ b/winpr/test/TestTypes.c @@ -22,7 +22,7 @@ static BOOL test_co_errors(void) { - size_t x; + size_t x = 0; const LONG should[] = { (LONG)0x80004006l, (LONG)0x80004007l, (LONG)0x80004008l, (LONG)0x80004009l, (LONG)0x8000400Al, (LONG)0x8000400Bl, (LONG)0x8000400Cl, (LONG)0x8000400Dl, @@ -142,7 +142,7 @@ static BOOL TestSucceededFailedMacros(HRESULT hr, char* sym, BOOL isSuccess) int TestTypes(int argc, char* argv[]) { BOOL ok = TRUE; - HRESULT hr; + HRESULT hr = 0; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/winpr/tools/hash-cli/hash.c b/winpr/tools/hash-cli/hash.c index 025a2b1e1..37d25c926 100644 --- a/winpr/tools/hash-cli/hash.c +++ b/winpr/tools/hash-cli/hash.c @@ -62,11 +62,11 @@ int main(int argc, char* argv[]) unsigned long version = 1; BYTE NtHash[16]; char* User = NULL; - size_t UserLength; + size_t UserLength = 0; char* Domain = NULL; - size_t DomainLength; + size_t DomainLength = 0; char* Password = NULL; - size_t PasswordLength; + size_t PasswordLength = 0; errno = 0; while (index < argc) diff --git a/winpr/tools/makecert-cli/main.c b/winpr/tools/makecert-cli/main.c index 553a20cde..fa01f7efd 100644 --- a/winpr/tools/makecert-cli/main.c +++ b/winpr/tools/makecert-cli/main.c @@ -29,7 +29,7 @@ int main(int argc, char* argv[]) { - MAKECERT_CONTEXT* context; + MAKECERT_CONTEXT* context = NULL; int ret = 0; context = makecert_context_new(); diff --git a/winpr/tools/makecert/makecert.c b/winpr/tools/makecert/makecert.c index 60826c5f7..efef232e0 100644 --- a/winpr/tools/makecert/makecert.c +++ b/winpr/tools/makecert/makecert.c @@ -79,9 +79,9 @@ static char* makecert_read_str(BIO* bio, size_t* pOffset) while (offset >= length) { - size_t new_len; + size_t new_len = 0; size_t readBytes = 0; - char* new_str; + char* new_str = NULL; new_len = length * 2; if (new_len == 0) new_len = 2048; @@ -131,8 +131,8 @@ static char* makecert_read_str(BIO* bio, size_t* pOffset) static int makecert_print_command_line_help(COMMAND_LINE_ARGUMENT_A* args, int argc, char** argv) { - char* str; - const COMMAND_LINE_ARGUMENT_A* arg; + char* str = NULL; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; if (!argv || (argc < 1)) return -1; @@ -182,7 +182,7 @@ static int makecert_print_command_line_help(COMMAND_LINE_ARGUMENT_A* args, int a static int x509_add_ext(X509* cert, int nid, char* value) { X509V3_CTX ctx; - X509_EXTENSION* ext; + X509_EXTENSION* ext = NULL; if (!cert || !value) return 0; @@ -201,8 +201,8 @@ static int x509_add_ext(X509* cert, int nid, char* value) static char* x509_name_parse(char* name, char* txt, size_t* length) { - char* p; - char* entry; + char* p = NULL; + char* entry = NULL; if (!name || !txt || !length) return NULL; @@ -286,9 +286,9 @@ static int command_line_pre_filter(MAKECERT_CONTEXT* context, int index, int arg static int makecert_context_parse_arguments(MAKECERT_CONTEXT* context, COMMAND_LINE_ARGUMENT_A* args, int argc, char** argv) { - int status; - DWORD flags; - const COMMAND_LINE_ARGUMENT_A* arg; + int status = 0; + DWORD flags = 0; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; if (!context || !argv || (argc < 0)) return -1; @@ -385,7 +385,7 @@ static int makecert_context_parse_arguments(MAKECERT_CONTEXT* context, } CommandLineSwitchCase(arg, "y") { - long val; + long val = 0; if (!(arg->Flags & COMMAND_LINE_ARGUMENT_PRESENT)) continue; @@ -399,7 +399,7 @@ static int makecert_context_parse_arguments(MAKECERT_CONTEXT* context, } CommandLineSwitchCase(arg, "m") { - long val; + long val = 0; if (!(arg->Flags & COMMAND_LINE_ARGUMENT_PRESENT)) continue; @@ -441,12 +441,12 @@ int makecert_context_output_certificate_file(MAKECERT_CONTEXT* context, const ch { #ifdef WITH_OPENSSL FILE* fp = NULL; - int status; - size_t length; - size_t offset; + int status = 0; + size_t length = 0; + size_t offset = 0; char* filename = NULL; char* fullpath = NULL; - char* ext; + char* ext = NULL; int ret = -1; BIO* bio = NULL; char* x509_str = NULL; @@ -611,8 +611,8 @@ int makecert_context_output_private_key_file(MAKECERT_CONTEXT* context, const ch { #ifdef WITH_OPENSSL FILE* fp = NULL; - size_t length; - size_t offset; + size_t length = 0; + size_t offset = 0; char* filename = NULL; char* fullpath = NULL; int ret = -1; @@ -909,14 +909,14 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv) { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; #ifdef WITH_OPENSSL - size_t length; - char* entry; - int key_length; + size_t length = 0; + char* entry = NULL; + int key_length = 0; long serial = 0; X509_NAME* name = NULL; const EVP_MD* md = NULL; - const COMMAND_LINE_ARGUMENT_A* arg; - int ret; + const COMMAND_LINE_ARGUMENT_A* arg = NULL; + int ret = 0; ret = makecert_context_parse_arguments(context, args, argc, argv); if (ret < 1) @@ -989,8 +989,8 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv) ASN1_INTEGER_set(X509_get_serialNumber(context->x509), serial); { - ASN1_TIME* before; - ASN1_TIME* after; + ASN1_TIME* before = NULL; + ASN1_TIME* after = NULL; #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) before = X509_get_notBefore(context->x509); after = X509_get_notAfter(context->x509); @@ -1075,9 +1075,9 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv) if (!context->silent) { - BIO* bio; - int status; - char* x509_str; + BIO* bio = NULL; + int status = 0; + char* x509_str = NULL; bio = BIO_new(BIO_s_mem()); if (!bio)