korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-15 06:55:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

obexd: fix not reading all buffered data

Browse Source
This commit is contained in:
Luiz Augusto von Dentz 2010-07-14 17:13:36 +03:00 committed by Marcel Holtmann
parent 6953eee756
commit 15130f0c06
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
obexd/client/transfer.c
View File

@ -235,19 +235,26 @@ static void get_xfer_listing_progress(GwObexXfer *xfer,
struct transfer_callback *callback = transfer->callback; struct transfer_callback *callback = transfer->callback;
gint bsize, bread; gint bsize, bread;
bsize = transfer->buffer_len - transfer->filled; do {
bsize = transfer->buffer_len - transfer->filled;
if (bsize < DEFAULT_BUFFER_SIZE) { if (bsize < DEFAULT_BUFFER_SIZE) {
transfer->buffer_len += DEFAULT_BUFFER_SIZE; transfer->buffer_len += DEFAULT_BUFFER_SIZE;
transfer->buffer = g_realloc(transfer->buffer, transfer->buffer_len); transfer->buffer = g_realloc(transfer->buffer, transfer->buffer_len);
bsize += DEFAULT_BUFFER_SIZE; bsize += DEFAULT_BUFFER_SIZE;
} }
if (gw_obex_xfer_read(xfer, transfer->buffer + transfer->filled, if (gw_obex_xfer_read(xfer, transfer->buffer + transfer->filled,
bsize, &bread, &transfer->err) == FALSE) bsize, &bread, &transfer->err) == FALSE) {
goto fail; if (transfer->err == GW_OBEX_ERROR_NO_DATA) {
transfer->err = 0;
break;
} else
goto fail;
}
transfer->filled += bread; transfer->filled += bread;
} while (bread != 0);
if (gw_obex_xfer_object_done(xfer)) { if (gw_obex_xfer_object_done(xfer)) {
if (transfer->filled > 0 && if (transfer->filled > 0 &&