korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-16 16:54:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

gobex: Fix being able to cancel completed requests

Browse Source 
This fixes bogus responses when rsp_func calls g_obex_cancel_req for
responses with final bit set.
This commit is contained in:
Luiz Augusto von Dentz 2014-04-07 13:56:51 +03:00
parent 1d23383bfe
commit 35938b779d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gobex/gobex.c
View File

@ -1098,6 +1098,10 @@ static void handle_response(GObex *obex, GError *err, GObexPacket *rsp)
p = obex->pending_req;
/* Reset if final so it can no longer be cancelled */
if (final_rsp)
obex->pending_req = NULL;
if (p->cancelled)
err = g_error_new(G_OBEX_ERROR, G_OBEX_ERROR_CANCELLED,
"The operation was cancelled");
@ -1116,10 +1120,8 @@ static void handle_response(GObex *obex, GError *err, GObexPacket *rsp)
if (p->cancelled)
g_error_free(err);
if (final_rsp) {
if (final_rsp)
pending_pkt_free(p);
obex->pending_req = NULL;
}
if (!disconn && g_queue_get_length(obex->tx_queue) > 0)
enable_tx(obex);