summaryrefslogtreecommitdiffstats
path: root/channels/rdpdr/client/rdpdr_main.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 01:25:36 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 01:25:36 +0000
commit8050c230ded858d59518fce751e28713dd4266f9 (patch)
tree3b2835ad0af9b436b7ae77963fc10735adc13d25 /channels/rdpdr/client/rdpdr_main.c
parentAdding upstream version 3.5.0+dfsg1. (diff)
downloadfreerdp3-8050c230ded858d59518fce751e28713dd4266f9.tar.xz
freerdp3-8050c230ded858d59518fce751e28713dd4266f9.zip
Adding upstream version 3.5.1+dfsg1.upstream/3.5.1+dfsg1upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'channels/rdpdr/client/rdpdr_main.c')
-rw-r--r--channels/rdpdr/client/rdpdr_main.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c
index 2ffa951..8cbb359 100644
--- a/channels/rdpdr/client/rdpdr_main.c
+++ b/channels/rdpdr/client/rdpdr_main.c
@@ -1861,7 +1861,7 @@ UINT rdpdr_send(rdpdrPlugin* rdpdr, wStream* s)
UINT status = 0;
rdpdrPlugin* plugin = (rdpdrPlugin*)rdpdr;
- if (!rdpdr || !s)
+ if (!s)
{
Stream_Release(s);
return CHANNEL_RC_NULL_DATA;
@@ -1870,16 +1870,14 @@ UINT rdpdr_send(rdpdrPlugin* rdpdr, wStream* s)
if (!plugin)
{
Stream_Release(s);
- status = CHANNEL_RC_BAD_INIT_HANDLE;
- }
- else
- {
- const size_t pos = Stream_GetPosition(s);
- rdpdr_dump_send_packet(rdpdr->log, WLOG_TRACE, s, "[rdpdr-channel] send");
- status = plugin->channelEntryPoints.pVirtualChannelWriteEx(
- plugin->InitHandle, plugin->OpenHandle, Stream_Buffer(s), pos, s);
+ return CHANNEL_RC_BAD_INIT_HANDLE;
}
+ const size_t pos = Stream_GetPosition(s);
+ rdpdr_dump_send_packet(rdpdr->log, WLOG_TRACE, s, "[rdpdr-channel] send");
+ status = plugin->channelEntryPoints.pVirtualChannelWriteEx(
+ plugin->InitHandle, plugin->OpenHandle, Stream_Buffer(s), pos, s);
+
if (status != CHANNEL_RC_OK)
{
Stream_Release(s);