[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52694] trunk/blender/source: fix for bug in console indent, was not copying the null terminator.

[Campbell Barton]

Revision: 52694
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52694
Author:   campbellbarton
Date:     2012-12-01 06:29:04 +0000 (Sat, 01 Dec 2012)
Log Message:
-----------
fix for bug in console indent, was not copying the null terminator.
also add assert to catch this case more quickly.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_console/console_draw.c
    trunk/blender/source/blender/editors/space_console/console_ops.c
    trunk/blender/source/gameengine/GamePlayer/common/bmfont.cpp

Modified: trunk/blender/source/blender/editors/space_console/console_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_console/console_draw.c	2012-12-01 03:26:57 UTC (rev 52693)
+++ trunk/blender/source/blender/editors/space_console/console_draw.c	2012-12-01 06:29:04 UTC (rev 52694)
@@ -146,7 +146,8 @@
 	ConsoleLine *cl = (ConsoleLine *)tvc->iter;
 	*line = cl->line;
 	*len = cl->len;
-
+	// printf("'%s' %d\n", *line, cl->len);
+	BLI_assert(cl->line[cl->len] == '\0' && (cl->len == 0 || cl->line[cl->len - 1] != '\0'));
 	return 1;
 }
 

Modified: trunk/blender/source/blender/editors/space_console/console_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_console/console_ops.c	2012-12-01 03:26:57 UTC (rev 52693)
+++ trunk/blender/source/blender/editors/space_console/console_ops.c	2012-12-01 06:29:04 UTC (rev 52694)
@@ -444,7 +444,7 @@
 
 	console_line_verify_length(ci, ci->len + len);
 
-	memmove(ci->line + len, ci->line, ci->len);
+	memmove(ci->line + len, ci->line, ci->len + 1);
 	memset(ci->line, ' ', len);
 	ci->len += len;
 	BLI_assert(ci->len >= 0);

Modified: trunk/blender/source/gameengine/GamePlayer/common/bmfont.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/bmfont.cpp	2012-12-01 03:26:57 UTC (rev 52693)
+++ trunk/blender/source/gameengine/GamePlayer/common/bmfont.cpp	2012-12-01 06:29:04 UTC (rev 52694)
@@ -73,9 +73,6 @@
 }
 */
 
-#define MAX2(x,y)          ( (x)>(y) ? (x) : (y) )
-#define MAX3(x,y,z)                MAX2( MAX2((x),(y)) , (z) )  
-
 void calcAlpha(ImBuf * ibuf)
 {
 	int i;