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 cd2e183aa5b3c011f84119d1830b82758eb0b727..95fede0710d13bf2d4a5a4338e0c0a0ddace5dd0 100644 (file)
--- 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)