From: Automerge Script <automerge@asterisk.org>
Date: Thu, 26 Apr 2007 17:21:20 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.19-netsec~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ce8de040419942f5a917f161af3a355b4d7bc77;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index cd2e183aa5..95fede0710 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3164,8 +3164,12 @@ static int iax2_setoption(struct ast_channel *c, int option, void *data, int dat
 
 static struct ast_frame *iax2_read(struct ast_channel *c) 
 {
-	ast_log(LOG_NOTICE, "I should never be called! Hanging up.\n");
-	return NULL;
+	static struct ast_frame null_frame = {
+		AST_FRAME_NULL,
+	};
+
+	ast_log(LOG_NOTICE, "I should never be called!\n");
+	return &null_frame;
 }
 
 static int iax2_start_transfer(unsigned short callno0, unsigned short callno1)