mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-crypto: fix tls_write_all ringbuffer usage

Browse Source
This commit is contained in:
Marc-André Moreau 2015-01-14 13:25:54 -05:00
parent 98cd697cad
commit 81e190eccb
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libfreerdp/crypto/tls.c
View File

@ -876,7 +876,9 @@ BIO *findBufferedBio(BIO *front)
int tls_write_all(rdpTls* tls, const BYTE* data, int length) int tls_write_all(rdpTls* tls, const BYTE* data, int length)
{ {
int status, nchunks; int i;
int status;
int nchunks;
int committedBytes; int committedBytes;
rdpTcp *tcp; rdpTcp *tcp;
#ifdef HAVE_POLL_H #ifdef HAVE_POLL_H
@ -968,11 +970,19 @@ int tls_write_all(rdpTls* tls, const BYTE* data, int length)
while (TRUE); while (TRUE);
/* make sure the output buffer is empty */ /* make sure the output buffer is empty */
committedBytes = 0;
while ((nchunks = ringbuffer_peek(&tcp->xmitBuffer, chunks, ringbuffer_used(&tcp->xmitBuffer)))) do
{ {
int i; committedBytes = 0;
if (ringbuffer_used(&tcp->xmitBuffer) < 1)
break;
nchunks = ringbuffer_peek(&tcp->xmitBuffer, chunks, ringbuffer_used(&tcp->xmitBuffer));
if (nchunks < 1)
break;
for (i = 0; i < nchunks; i++) for (i = 0; i < nchunks; i++)
{ {
while (chunks[i].size) while (chunks[i].size)
@ -1013,14 +1023,17 @@ int tls_write_all(rdpTls* tls, const BYTE* data, int length)
} }
} }
}
ringbuffer_commit_read_bytes(&tcp->xmitBuffer, committedBytes);
ringbuffer_commit_read_bytes(&tcp->xmitBuffer, committedBytes); continue;
return length;
out_fail: out_fail:
ringbuffer_commit_read_bytes(&tcp->xmitBuffer, committedBytes); ringbuffer_commit_read_bytes(&tcp->xmitBuffer, committedBytes);
return -1; return -1;
}
while (TRUE);
return length;
} }
int tls_set_alert_code(rdpTls* tls, int level, int description) int tls_set_alert_code(rdpTls* tls, int level, int description)