From 4d4e7a69d752fb9ab0ac90ab00c39f7bc47aaa82 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Thu, 9 May 2019 13:50:39 +0200 Subject: [PATCH] Fixed remaining getter/setter return checks. --- client/common/file.c | 7 ++++--- libfreerdp/common/assistance.c | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/client/common/file.c b/client/common/file.c index fff513298..748ae258d 100644 --- a/client/common/file.c +++ b/client/common/file.c @@ -1009,8 +1009,8 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings* if (~((size_t) file->RemoteApplicationFile)) { - if (freerdp_settings_set_string(settings, FreeRDP_RemoteApplicationGuid, - file->RemoteApplicationGuid) != 0) + if (!freerdp_settings_set_string(settings, FreeRDP_RemoteApplicationGuid, + file->RemoteApplicationGuid)) return FALSE; } @@ -1168,7 +1168,8 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings* * devicestoredirect:s:USB\VID_04A9&PID_30C1\6&4BD985D&0&2;,DynamicDevices * */ - freerdp_settings_set_bool(settings, FreeRDP_RedirectDrives, TRUE); + if (!freerdp_settings_set_bool(settings, FreeRDP_RedirectDrives, TRUE)) + return FALSE; } if (~((size_t) file->DrivesToRedirect)) diff --git a/libfreerdp/common/assistance.c b/libfreerdp/common/assistance.c index 4d34e685f..6ac741117 100644 --- a/libfreerdp/common/assistance.c +++ b/libfreerdp/common/assistance.c @@ -1155,7 +1155,9 @@ BOOL freerdp_assistance_populate_settings_from_assistance_file(rdpAssistanceFile rdpSettings* settings) { UINT32 i; - freerdp_settings_set_bool(settings, FreeRDP_RemoteAssistanceMode, TRUE); + + if (!freerdp_settings_set_bool(settings, FreeRDP_RemoteAssistanceMode, TRUE)) + return FALSE; if (!file->RASessionId || !file->MachineAddresses) return FALSE;