[asterisk-commits] tilghman: trunk r169723 - in /trunk: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Jan 21 15:03:40 2009
New Revision: 169723

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=169723
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/main/asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/asterisk.c?view=diff&rev=169723&r1=169722&r2=169723
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Wed Jan 21 15:03:40 2009
@@ -2125,6 +2125,7 @@
 				if (*tmp == 127) {
 					memmove(tmp, tmp + 1, strlen(tmp));
 					tmp--;
+					res--;
 				}
 			}