automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@12040 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Automerge script 20 years ago
parent c0763951ba
commit 8d808bd9d3

@ -2092,7 +2092,7 @@ char *ast_recvtext(struct ast_channel *chan, int timeout)
if (f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_HANGUP) if (f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_HANGUP)
done = 1; /* force a break */ done = 1; /* force a break */
else if (f->frametype == AST_FRAME_TEXT) { /* what we want */ else if (f->frametype == AST_FRAME_TEXT) { /* what we want */
buf = strndup((char *) f->data, f->datalen); /* dup and break */ buf = ast_strndup((char *) f->data, f->datalen); /* dup and break */
done = 1; done = 1;
} }
ast_frfree(f); ast_frfree(f);

Loading…
Cancel
Save