morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[coverity] 1543048 Dereference before null check

Browse Source
This commit is contained in:
akallabeth
2024-04-11 14:55:02 +02:00
committed by Martin Fleisz
parent 0a34b1e95d
commit 7b0723efd2
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
channels/drdynvc/client/drdynvc_main.c
View File

@@ -457,7 +457,6 @@ 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 = NULL;
DrdynvcClientContext* context = NULL;
WINPR_ASSERT(channel);
@@ -466,20 +465,24 @@ static UINT dvcman_channel_close(DVCMAN_CHANNEL* channel, BOOL perRequest, BOOL
case DVC_CHANNEL_INIT:
break;
case DVC_CHANNEL_RUNNING:
drdynvc = channel->dvcman->drdynvc;
context = drdynvc->context;
if (perRequest)
WLog_Print(drdynvc->log, WLOG_DEBUG, "sending close confirm for '%s'",
channel->channel_name);
error = dvcchannel_send_close(channel);
if (error != CHANNEL_RC_OK)
if (channel->dvcman)
{
const char* msg = "error when sending close confirm for '%s'";
drdynvcPlugin* drdynvc = channel->dvcman->drdynvc;
WINPR_ASSERT(drdynvc);
context = drdynvc->context;
if (perRequest)
msg = "error when sending closeRequest for '%s'";
WLog_Print(drdynvc->log, WLOG_DEBUG, "sending close confirm for '%s'",
channel->channel_name);
WLog_Print(drdynvc->log, WLOG_DEBUG, msg, channel->channel_name);
error = dvcchannel_send_close(channel);
if (error != CHANNEL_RC_OK)
{
const char* msg = "error when sending close confirm for '%s'";
if (perRequest)
msg = "error when sending closeRequest for '%s'";
WLog_Print(drdynvc->log, WLOG_DEBUG, msg, channel->channel_name);
}
}
channel->state = DVC_CHANNEL_CLOSED;