Merged revisions 169722 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 21 Jan 2009 21:03:40 +0000 (21:03 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 21 Jan 2009 21:03:40 +0000 (21:03 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r169722 | tilghman | 2009-01-21 15:02:32 -0600 (Wed, 21 Jan 2009) | 8 lines

  Extra NULLs in the output cause some terminal types to abort in the middle of
  a color code, causing terminal weirdness.
  (closes issue #14130)
   Reported by: coolmig
   Patches:
         20090121__bug14130.diff.txt uploaded by Corydon76 (license 14)
   Tested by: Corydon76, coolmig
........

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

main/asterisk.c

index 7cc9b6c..25c08f4 100644 (file)
@@ -2125,6 +2125,7 @@ static int ast_el_read_char(EditLine *editline, char *cp)
                                if (*tmp == 127) {
                                        memmove(tmp, tmp + 1, strlen(tmp));
                                        tmp--;
                                if (*tmp == 127) {
                                        memmove(tmp, tmp + 1, strlen(tmp));
                                        tmp--;
+                                       res--;
                                }
                        }
 
                                }
                        }