[asterisk-commits] bbryant: trunk r288008 - in /trunk: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: bbryant
Date: Tue Sep 21 14:50:46 2010
New Revision: 288008

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=288008
Log:
Merged revisions 288007 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288007 | bbryant | 2010-09-21 15:48:53 -0400 (Tue, 21 Sep 2010) | 21 lines
  
  Merged revisions 288006 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r288006 | bbryant | 2010-09-21 15:46:20 -0400 (Tue, 21 Sep 2010) | 14 lines
    
    Merged revisions 288005 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r288005 | bbryant | 2010-09-21 15:43:46 -0400 (Tue, 21 Sep 2010) | 8 lines
      
      Add a check to fix a rare segmentation fault you'd get if ast_frdup couldn't allocate
      memory on the first frame being queued in ast_queue_frame.
      
      (closes issue #17882)
      Reported by: seanbright
      Tested by: seanbright
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=288008&r1=288007&r2=288008
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue Sep 21 14:50:46 2010
@@ -1366,7 +1366,9 @@
 	AST_LIST_HEAD_INIT_NOLOCK(&frames);
 	for (cur = fin; cur; cur = AST_LIST_NEXT(cur, frame_list)) {
 		if (!(f = ast_frdup(cur))) {
-			ast_frfree(AST_LIST_FIRST(&frames));
+			if (AST_LIST_FIRST(&frames)) {
+				ast_frfree(AST_LIST_FIRST(&frames));
+			}
 			ast_channel_unlock(chan);
 			return -1;
 		}