summaryrefslogtreecommitdiff
path: root/gobex
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2014-08-11 10:50:40 +0300
committerJohan Hedberg <johan.hedberg@intel.com>2014-08-11 16:26:09 +0300
commit662b5e4d577f16adeadb06422187d93693aee72a (patch)
tree62fbe34e8d89c59564492416c78274c64c8ec22b /gobex
parentce6caf0f724bc20a67ad3b6d849a70b6cd7c8a49 (diff)
downloadbluez-662b5e4d577f16adeadb06422187d93693aee72a.tar.gz
gobex: Fix use after free
It is better not to dereference freed pointer
Diffstat (limited to 'gobex')
-rw-r--r--gobex/gobex.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/gobex/gobex.c b/gobex/gobex.c
index 3848884cd..16a4aae9c 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -250,6 +250,7 @@ static gboolean req_timeout(gpointer user_data)
g_assert(p != NULL);
+ p->timeout_id = 0;
obex->pending_req = NULL;
err = g_error_new(G_OBEX_ERROR, G_OBEX_ERROR_TIMEOUT,
@@ -263,8 +264,6 @@ static gboolean req_timeout(gpointer user_data)
g_error_free(err);
pending_pkt_free(p);
- p->timeout_id = 0;
-
return FALSE;
}