[Pkg-voip-commits] [asterisk] 02/03: AST-2017-013: backport and include

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch jessie
in repository asterisk.

commit 33507731eb653e93d8e3e76f7f7871e472c7ebb8
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Wed Dec 13 23:14:46 2017 +0200

    AST-2017-013: backport and include
---
 debian/patches/AST-2017-013.patch | 31 +++++++++----------------------
 debian/patches/series             |  1 +
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/debian/patches/AST-2017-013.patch b/debian/patches/AST-2017-013.patch
index 55010b7..2070af8 100644
--- a/debian/patches/AST-2017-013.patch
+++ b/debian/patches/AST-2017-013.patch
@@ -33,32 +33,19 @@ diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
 index ad7351df3a..ccf6a94641 100644
 --- a/channels/chan_skinny.c
 +++ b/channels/chan_skinny.c
-@@ -7429,6 +7429,11 @@ static void destroy_session(struct skinnysession *s)
- 	}
- 	ast_mutex_unlock(&s->lock);
- 	ast_mutex_destroy(&s->lock);
-+
-+	if (s->t != AST_PTHREADT_NULL) {
-+		pthread_detach(s->t);
-+	}
-+
- 	ast_free(s);
- }
+@@ -7429,6 +7429,10 @@ static void destroy_session(struct skinnysession *s)
+ 			}
  
-@@ -7515,11 +7520,6 @@ static void *skinny_session(void *data)
- 	int eventmessage = 0;
- 	struct pollfd fds[1];
+ 			ast_mutex_destroy(&s->lock);
++
++			if (s->t != AST_PTHREADT_NULL) {
++				pthread_detach(s->t);
++			}
  
--	if (!s) {
--		ast_log(LOG_WARNING, "Bad Skinny Session\n");
--		return 0;
--	}
--
- 	ast_log(LOG_NOTICE, "Starting Skinny session from %s\n", ast_inet_ntoa(s->sin.sin_addr));
+ 			ast_free(s);
  
- 	pthread_cleanup_push(skinny_session_cleanup, s);
 @@ -7685,6 +7685,7 @@ static void *accept_thread(void *ignore)
- 		s->keepalive_timeout_sched = -1;
+ 		AST_LIST_UNLOCK(&sessions);
  
  		if (ast_pthread_create(&s->t, NULL, skinny_session, s)) {
 +			s->t = AST_PTHREADT_NULL;
diff --git a/debian/patches/series b/debian/patches/series
index bee18cc..eb2a322 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,3 +48,4 @@ AST-2016-009-11.diff
 AST-2017-005-11.diff
 AST-2017-006-11.diff
 AST-2017-008-11.diff
+AST-2017-013.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git