aboutsummaryrefslogtreecommitdiffstats
path: root/main/asterisk.c
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-21 21:05:07 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-21 21:05:07 +0000
commit3330c3875ead5656e93d13e55e44e08711f655cd (patch)
tree6b0c0aea7ba1809539a29b8c85eb1ce58b586efc /main/asterisk.c
parentb04e99475894c12435d36b28547f5e849c85faca (diff)
Merged revisions 169723 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r169723 | tilghman | 2009-01-21 15:03:40 -0600 (Wed, 21 Jan 2009) | 15 lines Merged revisions 169722 via svnmerge from 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: http://svn.digium.com/svn/asterisk/branches/1.6.1@169725 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/asterisk.c')
-rw-r--r--main/asterisk.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index 94d5e557b..f3bb6af81 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -1985,6 +1985,7 @@ static int ast_el_read_char(EditLine *editline, char *cp)
if (*tmp == 127) {
memmove(tmp, tmp + 1, strlen(tmp));
tmp--;
+ res--;
}
}