Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FreeRDP/FreeRDP-old.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVic Lee <llyzs@163.com>2011-06-30 11:27:00 +0400
committerVic Lee <llyzs@163.com>2011-06-30 11:27:00 +0400
commit143f181bbe3efb0af4c00feec50cb5e7457b5863 (patch)
treed8c040b960952e8d7d8bd423e8e676c10167c667
parent991b71c75beedd56c5db987ecb5d2da02a07240f (diff)
libfreerdp-core: fix error checking after tcp_read is called.
-rw-r--r--libfreerdp-core/network.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libfreerdp-core/network.c b/libfreerdp-core/network.c
index 5d9904d..7280f68 100644
--- a/libfreerdp-core/network.c
+++ b/libfreerdp-core/network.c
@@ -272,9 +272,6 @@ network_recv(rdpNetwork * net, STREAM s, uint32 length)
if (net->tls_connected)
{
rcvd = tls_read(net->tls, (char*) s->end, length);
-
- if (rcvd < 0)
- return NULL;
}
else
#endif
@@ -282,6 +279,9 @@ network_recv(rdpNetwork * net, STREAM s, uint32 length)
rcvd = tcp_read(net->tcp, (char*) s->end, length);
}
+ if (rcvd < 0)
+ return NULL;
+
s->end += rcvd;
length -= rcvd;
}