[svn-commits] bbryant: branch 1.4 r288005 - /branches/1.4/main/channel.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Tue Sep 21 14:43:46 2010
New Revision: 288005

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=288005
Log:
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:
    branches/1.4/main/channel.c

Modified: branches/1.4/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/channel.c?view=diff&rev=288005&r1=288004&r2=288005
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Tue Sep 21 14:43:46 2010
@@ -927,7 +927,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;
 		}