From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 24 Oct 2006 03:01:00 +0000 (+0000)
Subject: Pass through a frame if we don't know what it is, rather than trying to pass a
X-Git-Tag: 1.4.0-beta4~294
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de9c3aaa8defcb63831c7dfe5f165bd0158b7096;p=thirdparty%2Fasterisk.git

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)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@46078 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/channel.c b/main/channel.c
index fb0d7464c0..4c6b630e46 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -2611,7 +2611,10 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
 		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;
 	}