From 891769666b0b2181ac035ba9035ae82c5eacb0d6 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 16 Feb 2009 23:17:01 +0000 Subject: [PATCH] Merged revisions 176320 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r176320 | tilghman | 2009-02-16 17:14:08 -0600 (Mon, 16 Feb 2009) | 7 lines Use the correct list macros for deleting an item from the middle of a list. (issue #13777) Reported by: pj Patches: 20090203__bug13777.diff.txt uploaded by Corydon76 (license 14) Tested by: pj ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@176321 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_skinny.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 56286dbe40..426dd5fea5 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -5867,9 +5867,9 @@ static void destroy_session(struct skinnysession *s) { struct skinnysession *cur; AST_LIST_LOCK(&sessions); - AST_LIST_TRAVERSE(&sessions, cur, list) { + AST_LIST_TRAVERSE_SAFE_BEGIN(&sessions, cur, list) { if (cur == s) { - AST_LIST_REMOVE(&sessions, s, list); + AST_LIST_REMOVE_CURRENT(list); if (s->fd > -1) close(s->fd); @@ -5880,6 +5880,7 @@ static void destroy_session(struct skinnysession *s) ast_log(LOG_WARNING, "Trying to delete nonexistent session %p?\n", s); } } + AST_LIST_TRAVERSE_SAFE_END AST_LIST_UNLOCK(&sessions); }