summaryrefslogtreecommitdiff
path: root/gobex
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2014-04-01 10:33:25 +0300
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2014-04-02 14:25:39 +0300
commitac93ba0e4465b248ffbb9c23a1582d52f69edda1 (patch)
tree6ed929a5ee281a9ddeb3cfc24ed04df4c9d56089 /gobex
parentccd67f611c7f22bee09437deec0f5c2653d5c94c (diff)
downloadbluez-ac93ba0e4465b248ffbb9c23a1582d52f69edda1.tar.gz
gobex: Fix asserting when resending connect request
In case connect requests needs to be resent to authenticate the timeout handle should be removed otherwise it may end up asserting: ERROR:gobex/gobex.c:251:req_timeout: assertion failed: (p != NULL)
Diffstat (limited to 'gobex')
-rw-r--r--gobex/gobex.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gobex/gobex.c b/gobex/gobex.c
index 880ed9159..4185ed17c 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -1016,6 +1016,8 @@ static void auth_challenge(GObex *obex)
/* Remove it as pending and add it back to the queue so it gets sent
* again */
+ g_source_remove(p->timeout);
+ p->timeout_id = 0;
obex->pending_req = NULL;
g_obex_send_internal(obex, p, NULL);
}