[asterisk-commits] tilghman: branch 1.6.1 r176321 - in /branches/1.6.1: ./ channels/chan_skinny.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Feb 16 17:17:01 2009
New Revision: 176321

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=176321
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_skinny.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_skinny.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_skinny.c?view=diff&rev=176321&r1=176320&r2=176321
==============================================================================
--- branches/1.6.1/channels/chan_skinny.c (original)
+++ branches/1.6.1/channels/chan_skinny.c Mon Feb 16 17:17:01 2009
@@ -5867,9 +5867,9 @@
 {
 	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 @@
 			ast_log(LOG_WARNING, "Trying to delete nonexistent session %p?\n", s);
 		}
 	}
+	AST_LIST_TRAVERSE_SAFE_END
 	AST_LIST_UNLOCK(&sessions);
 }