[svn-commits] tilghman: branch 1.6.0 r169724 - in /branches/1.6.0: ./ main/asterisk.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Jan 21 15:04:24 2009
New Revision: 169724

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/asterisk.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

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