automerge commit

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

diff --git a/channel.c b/channel.c
index bf1f3637c27bd15773d8f5394ef872abbca96d43..011bdaef3e6dfb34039a4f5d82009f5726d56377 100644 (file)
--- a/channel.c
+++ b/channel.c
@@ -2092,7 +2092,7 @@ char *ast_recvtext(struct ast_channel *chan, int timeout)
                if (f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_HANGUP)
                        done = 1;       /* force a break */
                else if (f->frametype == AST_FRAME_TEXT) {              /* what we want */
-                       buf = ast_strndup((char *) f->data, f->datalen);        /* dup and break */
+                       buf = strndup((char *) f->data, f->datalen);    /* dup and break */
                        done = 1;
                }
                ast_frfree(f);