kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-01-21 17:12:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@62733 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-05-02 18:18:44 +00:00
parent da66cc3c63
commit fa0aba61e8
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
channels/chan_iax2.c
View File

@@ -6732,6 +6732,13 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
ast_mutex_unlock(&iaxsl[fr->callno]);
return 1;
}
/* Ensure text frames are NULL-terminated */
if (f.frametype == AST_FRAME_TEXT && buf[res - 1] != '\0') {
if (res < sizeof(buf))
buf[res++] = '\0';
else /* Trims one character from the text message, but that's better than overwriting the end of the buffer. */
buf[res - 1] = '\0';
}
f.datalen = res - sizeof(*fh);
/* Handle implicit ACKing unless this is an INVAL, and only if this is