From ccfe0c129e8781a405450efa3cdfbb52a3b34064 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 16 Jun 2021 10:41:10 +0200 Subject: [PATCH] Removed checks already done by WINPR_ASSERT --- channels/drdynvc/client/drdynvc_main.c | 2 -- channels/rdpdr/client/rdpdr_main.c | 2 -- channels/urbdrc/client/libusb/libusb_udevman.c | 2 -- client/X11/xf_event.c | 2 -- client/X11/xf_keyboard.c | 2 -- client/X11/xf_rail.c | 4 ---- libfreerdp/core/client.c | 2 -- libfreerdp/core/gateway/rpc_client.c | 3 --- server/shadow/shadow_subsystem.c | 11 +++++------ 9 files changed, 5 insertions(+), 25 deletions(-) diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c index 635962cb2..65129d093 100644 --- a/channels/drdynvc/client/drdynvc_main.c +++ b/channels/drdynvc/client/drdynvc_main.c @@ -1464,8 +1464,6 @@ static UINT drdynvc_virtual_channel_event_initialized(drdynvcPlugin* drdynvc, LP } obj = MessageQueue_Object(drdynvc->queue); - if (!obj) - goto error; obj->fnObjectFree = drdynvc_queue_object_free; drdynvc->channel_mgr = dvcman_new(drdynvc); diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c index 8ea0d631a..dcd4375f6 100644 --- a/channels/rdpdr/client/rdpdr_main.c +++ b/channels/rdpdr/client/rdpdr_main.c @@ -1722,8 +1722,6 @@ static UINT rdpdr_virtual_channel_event_connected(rdpdrPlugin* rdpdr, LPVOID pDa } obj = MessageQueue_Object(rdpdr->queue); - if (!obj) - return ERROR_INTERNAL_ERROR; obj->fnObjectFree = queue_free; if (!(rdpdr->thread = diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c index 8a3f0dc38..4921023c6 100644 --- a/channels/urbdrc/client/libusb/libusb_udevman.c +++ b/channels/urbdrc/client/libusb/libusb_udevman.c @@ -918,8 +918,6 @@ UINT freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS if (!udevman->hotplug_vid_pids) goto fail; obj = ArrayList_Object(udevman->hotplug_vid_pids); - if (!obj) - goto fail; obj->fnObjectFree = free; obj->fnObjectEquals = udevman_vid_pid_pair_equals; diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c index ab49112cb..e18f0a1e0 100644 --- a/client/X11/xf_event.c +++ b/client/X11/xf_event.c @@ -178,8 +178,6 @@ BOOL xf_event_action_script_init(xfContext* xfc) return FALSE; obj = ArrayList_Object(xfc->xevents); - if (!obj) - return FALSE; obj->fnObjectFree = free; sprintf_s(command, sizeof(command), "%s xevent", xfc->context.settings->ActionScript); actionScript = popen(command, "r"); diff --git a/client/X11/xf_keyboard.c b/client/X11/xf_keyboard.c index 1f720e9dc..94ebc82bb 100644 --- a/client/X11/xf_keyboard.c +++ b/client/X11/xf_keyboard.c @@ -72,8 +72,6 @@ static BOOL xf_keyboard_action_script_init(xfContext* xfc) return FALSE; obj = ArrayList_Object(xfc->keyCombinations); - if (!obj) - return FALSE; obj->fnObjectFree = free; sprintf_s(command, sizeof(command), "%s key", xfc->context.settings->ActionScript); keyScript = popen(command, "r"); diff --git a/client/X11/xf_rail.c b/client/X11/xf_rail.c index e321ae38b..820f4df2f 100644 --- a/client/X11/xf_rail.c +++ b/client/X11/xf_rail.c @@ -1105,14 +1105,10 @@ int xf_rail_init(xfContext* xfc, RailClientContext* rail) goto fail; { wObject* obj = HashTable_KeyObject(xfc->railWindows); - if (!obj) - goto fail; obj->fnObjectEquals = rail_window_key_equals; } { wObject* obj = HashTable_ValueObject(xfc->railWindows); - if (!obj) - goto fail; obj->fnObjectFree = rail_window_free; } xfc->railIconCache = RailIconCache_New(xfc->context.settings); diff --git a/libfreerdp/core/client.c b/libfreerdp/core/client.c index 4dbe34821..bb04881dc 100644 --- a/libfreerdp/core/client.c +++ b/libfreerdp/core/client.c @@ -158,8 +158,6 @@ rdpChannels* freerdp_channels_new(freerdp* instance) goto error; obj = MessageQueue_Object(channels->queue); - if (!obj) - goto error; obj->fnObjectFree = channel_queue_free; return channels; diff --git a/libfreerdp/core/gateway/rpc_client.c b/libfreerdp/core/gateway/rpc_client.c index a30148522..c2f299b20 100644 --- a/libfreerdp/core/gateway/rpc_client.c +++ b/libfreerdp/core/gateway/rpc_client.c @@ -1084,9 +1084,6 @@ RpcClient* rpc_client_new(rdpContext* context, UINT32 max_recv_frag) goto fail; obj = ArrayList_Object(client->ClientCallList); - if (!obj) - goto fail; - obj->fnObjectFree = rpc_array_client_call_free; return client; fail: diff --git a/server/shadow/shadow_subsystem.c b/server/shadow/shadow_subsystem.c index f587d1103..902e52457 100644 --- a/server/shadow/shadow_subsystem.c +++ b/server/shadow/shadow_subsystem.c @@ -129,13 +129,12 @@ void shadow_subsystem_uninit(rdpShadowSubsystem* subsystem) wObject* obj2; /* Release resource in messages before free */ obj1 = MessageQueue_Object(subsystem->MsgPipe->In); - obj2 = MessageQueue_Object(subsystem->MsgPipe->Out); - if (obj1) - obj1->fnObjectFree = shadow_subsystem_free_queued_message; - MessageQueue_Clear(subsystem->MsgPipe->In); - if (obj2) - obj2->fnObjectFree = shadow_subsystem_free_queued_message; + obj1->fnObjectFree = shadow_subsystem_free_queued_message; + MessageQueue_Clear(subsystem->MsgPipe->In); + + obj2 = MessageQueue_Object(subsystem->MsgPipe->Out); + obj2->fnObjectFree = shadow_subsystem_free_queued_message; MessageQueue_Clear(subsystem->MsgPipe->Out); MessagePipe_Free(subsystem->MsgPipe); subsystem->MsgPipe = NULL;