From 8a3e984b0c4c681909f8b8940d020a4e1141e9a3 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 29 Nov 2007 00:07:32 +0000
Subject: [PATCH] Merged revisions 90142 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r90142 | russell | 2007-11-28 18:06:08 -0600 (Wed, 28 Nov 2007) | 4 lines
Merge a change from team/russell/chan_refcount ...
This makes ast_stopstream() thread-safe.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90143 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
include/asterisk/file.h | 7 ++++++-
main/file.c | 5 +++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/include/asterisk/file.h b/include/asterisk/file.h
index 1fc496fdbe..5b795d430d 100644
--- a/include/asterisk/file.h
+++ b/include/asterisk/file.h
@@ -66,9 +66,14 @@ int ast_stream_and_wait(struct ast_channel *chan, const char *file, const char *
/*!
* \brief Stops a stream
+ *
* \param c The channel you wish to stop playback on
+ *
* Stop playback of a stream
- * \return 0 regardless
+ *
+ * \retval 0 always
+ *
+ * \note The channel does not need to be locked before calling this function.
*/
int ast_stopstream(struct ast_channel *c);
diff --git a/main/file.c b/main/file.c
index be5c019de9..bbdda4c381 100644
--- a/main/file.c
+++ b/main/file.c
@@ -119,6 +119,8 @@ int ast_format_unregister(const char *name)
int ast_stopstream(struct ast_channel *tmp)
{
+ ast_channel_lock(tmp);
+
/* Stop a running stream if there is one */
if (tmp->stream) {
ast_closestream(tmp->stream);
@@ -131,6 +133,9 @@ int ast_stopstream(struct ast_channel *tmp)
ast_closestream(tmp->vstream);
tmp->vstream = NULL;
}
+
+ ast_channel_unlock(tmp);
+
return 0;
}
--
GitLab