[asterisk-commits] mvanbaak: branch 1.6.1 r158689 - in /branches/1.6.1: ./ channels/chan_skinny.c

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Sat Nov 22 10:38:46 2008
New Revision: 158689

URL: http://svn.digium.com/view/asterisk?view=rev&rev=158689
Log:
Merged revisions 158688 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r158688 | mvanbaak | 2008-11-22 17:06:38 +0100 (Sat, 22 Nov 2008) | 4 lines
  
  fix a very occasional core dump in chan_skinny found by wedhorn.
  
  (issue #13948)
........

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/view/asterisk/branches/1.6.1/channels/chan_skinny.c?view=diff&rev=158689&r1=158688&r2=158689
==============================================================================
--- branches/1.6.1/channels/chan_skinny.c (original)
+++ branches/1.6.1/channels/chan_skinny.c Sat Nov 22 10:38:46 2008
@@ -4842,7 +4842,8 @@
 				l->name, d->name, sub->callid);
 		}
 	}
-	if ((l->hookstate == SKINNY_ONHOOK) && (AST_LIST_NEXT(sub, list) && !AST_LIST_NEXT(sub, list)->rtp)) {
+	/* The bit commented below gives a very occasional core dump. */
+	if ((l->hookstate == SKINNY_ONHOOK) && (AST_LIST_NEXT(sub, list) /*&& !AST_LIST_NEXT(sub, list)->rtp*/)) {
 		do_housekeeping(s);
 	}
 	return 1;