summaryrefslogtreecommitdiff
path: root/android/avdtp.c
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2013-12-18 14:29:43 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2013-12-18 14:53:34 +0200
commit24fc2b639e6fe567633a60dd4d99eca36a0f1323 (patch)
tree380d1a489ebc104222d3fb943d789076316ab16f /android/avdtp.c
parenteb220d8d8bd1a955c95f686686ec60b53ea8a5d9 (diff)
downloadbluez-24fc2b639e6fe567633a60dd4d99eca36a0f1323.tar.gz
android/AVDTP: Fix not removing start_timer source
It is possible that stream->start_timer can be set on stream_free which should then should take care of remove it properly otherwise it can trigger which would very likely cause a crash. Thanks to Hannu Mallat <hannu.mallat@jolla.com> for reporting it.
Diffstat (limited to 'android/avdtp.c')
-rw-r--r--android/avdtp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/android/avdtp.c b/android/avdtp.c
index 5ae3afc46..3a3380af8 100644
--- a/android/avdtp.c
+++ b/android/avdtp.c
@@ -670,6 +670,9 @@ static void stream_free(void *data)
if (stream->timer)
g_source_remove(stream->timer);
+ if (stream->start_timer > 0)
+ g_source_remove(stream->start_timer);
+
if (stream->io)
close_stream(stream);