[svn-commits] tilghman: trunk r46079 - in /trunk: ./ main/channel.c

[svn-commits at lists.digium.com]

Author: tilghman
Date: Mon Oct 23 22:09:48 2006
New Revision: 46079

URL: http://svn.digium.com/view/asterisk?rev=46079&view=rev
Log:
Merged revisions 46078 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46078 | tilghman | 2006-10-23 22:01:00 -0500 (Mon, 23 Oct 2006) | 3 lines

Pass through a frame if we don't know what it is, rather than trying to pass a
NULL, which will segfault a channel driver (Bug 8149)

........

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

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

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?rev=46079&r1=46078&r2=46079&view=diff
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Oct 23 22:09:48 2006
@@ -2615,7 +2615,10 @@
 		res = 0;
 		break;
 	default:
-		res = chan->tech->write(chan, f);
+		/* At this point, fr is the incoming frame and f is NULL.  Channels do
+		 * not expect to get NULL as a frame pointer and will segfault.  Hence,
+		 * we output the original frame passed in. */
+		res = chan->tech->write(chan, fr);
 		break;
 	}