diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-16 23:17:01 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-16 23:17:01 +0000 |
| commit | 13e3c9652db111e4fd8d65f48b1c895b648e616b (patch) | |
| tree | 06cc194eb11774be99ad61c7c4b3ba22d6f8253e /channels/chan_skinny.c | |
| parent | 7aff56497d04a19a5917fe3538468aa337a7a946 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@176321 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_skinny.c')
| -rw-r--r-- | channels/chan_skinny.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 56286dbe4..426dd5fea 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); } |