From 5fda2181166f8c21bf03cd3f64bb3f0b75e04ab1 Mon Sep 17 00:00:00 2001 From: Maks Naumov Date: Wed, 5 Mar 2014 14:24:07 +0200 Subject: [PATCH 1/3] fix "_settings->ClientTimeZone" initialization --- libfreerdp/core/settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 85853051f017178d1e8f7b82e6aa34e36dbea804 Mon Sep 17 00:00:00 2001 From: Maks Naumov Date: Wed, 5 Mar 2014 14:49:00 +0200 Subject: [PATCH 2/3] fix filing array of "messages" sizeof(sizeof(struct) * struct_count) == sizeof(size_t) --- libfreerdp/codec/nsc_encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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++) { From ec7cc1d5238177fdacd967826114c2840c4a2201 Mon Sep 17 00:00:00 2001 From: Maks Naumov Date: Wed, 5 Mar 2014 14:55:22 +0200 Subject: [PATCH 3/3] fix window_list_has_next() --- libfreerdp/rail/window_list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; }