ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpcrt4: Fix rpcrt4_conn_tcp_read and rpcrt4_conn_tcp_write for reading/writing zero-sized data.

This commit is contained in:
Rob Shearman 2009-12-13 21:35:34 +00:00 committed by Alexandre Julliard
parent 6ad4d5922b
commit ceb7fda374
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/rpcrt4/rpc_transport.c
View File

@ -1345,7 +1345,7 @@ static int rpcrt4_conn_tcp_read(RpcConnection *Connection,
{ {
RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection;
int bytes_read = 0; int bytes_read = 0;
do while (bytes_read != count)
{ {
int r = recv(tcpc->sock, (char *)buffer + bytes_read, count - bytes_read, 0); int r = recv(tcpc->sock, (char *)buffer + bytes_read, count - bytes_read, 0);
if (!r) if (!r)
@ -1362,7 +1362,7 @@ static int rpcrt4_conn_tcp_read(RpcConnection *Connection,
if (!rpcrt4_sock_wait_for_recv(tcpc)) if (!rpcrt4_sock_wait_for_recv(tcpc))
return -1; return -1;
} }
} while (bytes_read != count); }
TRACE("%d %p %u -> %d\n", tcpc->sock, buffer, count, bytes_read); TRACE("%d %p %u -> %d\n", tcpc->sock, buffer, count, bytes_read);
return bytes_read; return bytes_read;
} }
@ -1372,7 +1372,7 @@ static int rpcrt4_conn_tcp_write(RpcConnection *Connection,
{ {
RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection;
int bytes_written = 0; int bytes_written = 0;
do while (bytes_written != count)
{ {
int r = send(tcpc->sock, (const char *)buffer + bytes_written, count - bytes_written, 0); int r = send(tcpc->sock, (const char *)buffer + bytes_written, count - bytes_written, 0);
if (r >= 0) if (r >= 0)
@ -1384,7 +1384,7 @@ static int rpcrt4_conn_tcp_write(RpcConnection *Connection,
if (!rpcrt4_sock_wait_for_send(tcpc)) if (!rpcrt4_sock_wait_for_send(tcpc))
return -1; return -1;
} }
} while (bytes_written != count); }
TRACE("%d %p %u -> %d\n", tcpc->sock, buffer, count, bytes_written); TRACE("%d %p %u -> %d\n", tcpc->sock, buffer, count, bytes_written);
return bytes_written; return bytes_written;
} }