Don't drop the first character randomly in long listings in the CLI.
authorOlle Johansson <oej@edvina.net>
Sun, 16 Dec 2007 09:37:41 +0000 (09:37 +0000)
committerOlle Johansson <oej@edvina.net>
Sun, 16 Dec 2007 09:37:41 +0000 (09:37 +0000)
Reported by: slavon
Patches:
      asterisk-consolerefresh2.diff.txt uploaded by jamesgolovich (license 176)
Tested by: eliel
(closes issue #9325)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93161 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/asterisk.c

index 67dc361..dbc4438 100644 (file)
@@ -1771,7 +1771,8 @@ static int ast_el_read_char(EditLine *el, char *cp)
        struct pollfd fds[2];
        int res;
        int max;
-       char buf[512];
+#define EL_BUF_SIZE 512
+       char buf[EL_BUF_SIZE];
 
        for (;;) {
                max = 1;
@@ -1833,7 +1834,7 @@ static int ast_el_read_char(EditLine *el, char *cp)
                        if (!ast_opt_exec && !lastpos)
                                write(STDOUT_FILENO, "\r", 1);
                        write(STDOUT_FILENO, buf, res);
-                       if ((buf[res-1] == '\n') || (buf[res-2] == '\n')) {
+                       if ((res < EL_BUF_SIZE - 1) && ((buf[res-1] == '\n') || (buf[res-2] == '\n'))) {
                                *cp = CC_REFRESH;
                                return(1);
                        } else