From 143f181bbe3efb0af4c00feec50cb5e7457b5863 Mon Sep 17 00:00:00 2001 From: Vic Lee Date: Thu, 30 Jun 2011 15:27:00 +0800 Subject: libfreerdp-core: fix error checking after tcp_read is called. --- libfreerdp-core/network.c | 6 +++--- 1 file 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; } -- cgit v1.2.3