diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c index 9f0dc4c04..17aabdc27 100644 --- a/libfreerdp/codec/nsc_encode.c +++ b/libfreerdp/codec/nsc_encode.c @@ -407,7 +407,7 @@ NSC_MESSAGE* nsc_encode_messages(NSC_CONTEXT* context, BYTE* data, int x, int y, maxDataSize -= 1024; /* reserve enough space for headers */ messages = (NSC_MESSAGE*) malloc(sizeof(NSC_MESSAGE) * (*numMessages)); - ZeroMemory(messages, sizeof(sizeof(NSC_MESSAGE) * (*numMessages))); + ZeroMemory(messages, sizeof(NSC_MESSAGE) * (*numMessages)); for (i = 0; i < rows; i++) { diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c index 38e7e27d5..0fb1255f6 100644 --- a/libfreerdp/core/settings.c +++ b/libfreerdp/core/settings.c @@ -726,7 +726,7 @@ rdpSettings* freerdp_settings_clone(rdpSettings* settings) CopyMemory(_settings->ServerAutoReconnectCookie, settings->ServerAutoReconnectCookie, sizeof(ARC_SC_PRIVATE_PACKET)); _settings->ClientTimeZone = (TIME_ZONE_INFO*) malloc(sizeof(TIME_ZONE_INFO)); - CopyMemory(_settings->ClientTimeZone, _settings->ClientTimeZone, sizeof(TIME_ZONE_INFO)); + CopyMemory(_settings->ClientTimeZone, settings->ClientTimeZone, sizeof(TIME_ZONE_INFO)); _settings->TargetNetAddressCount = settings->TargetNetAddressCount; diff --git a/libfreerdp/rail/window_list.c b/libfreerdp/rail/window_list.c index 9fcbd2db8..c0ecef724 100644 --- a/libfreerdp/rail/window_list.c +++ b/libfreerdp/rail/window_list.c @@ -38,7 +38,7 @@ BOOL window_list_has_next(rdpWindowList* list) { if (list->iterator != NULL) { - if (list->iterator != NULL) + if (list->iterator->next != NULL) return TRUE; }