aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-21 21:04:24 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-21 21:04:24 +0000
commit78374d48b6e46476118fada628e56e560dda3b3e (patch)
treea4859c2dda2ed9ae6d9ed72cf9c06a2932885e8d /main
parent6343bc6d647391f49b69e013bdb369e4efb6b925 (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.0@169724 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/asterisk.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index d1b37b575..4c9aa4a3c 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -1966,6 +1966,7 @@ static int ast_el_read_char(EditLine *el, char *cp)
if (*tmp == 127) {
memmove(tmp, tmp + 1, strlen(tmp));
tmp--;
+ res--;
}
}