Merged revisions 221777 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r221777 | tilghman | 2009-10-01 18:59:15 -0500 (Thu, 01 Oct 2009) | 9 lines
  
  Merged revisions 221776 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r221776 | tilghman | 2009-10-01 18:53:12 -0500 (Thu, 01 Oct 2009) | 2 lines
    
    Fix a bunch of off-by-one errors
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@221778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-10-02 00:03:52 +00:00
parent a2be864b60
commit a37107aae6
3 changed files with 21 additions and 20 deletions

View File

@@ -1018,7 +1018,7 @@ static void *netconsole(void *vconsole)
continue;
}
if (fds[0].revents) {
res = read(con->fd, tmp, sizeof(tmp));
res = read(con->fd, tmp, sizeof(tmp) - 1);
if (res < 1) {
break;
}
@@ -2271,7 +2271,7 @@ static char *cli_complete(EditLine *el, int ch)
if (ast_opt_remote) {
snprintf(buf, sizeof(buf), "_COMMAND NUMMATCHES \"%s\" \"%s\"", lf->buffer, ptr);
fdsend(ast_consock, buf);
res = read(ast_consock, buf, sizeof(buf));
res = read(ast_consock, buf, sizeof(buf) - 1);
buf[res] = '\0';
nummatches = atoi(buf);