X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/37508af4ab231b1fde58345f5237f3ee82803829..fef97f438c8c83ac625799c88e8f2da53d5f51cc:/terminal.c

diff --git a/terminal.c b/terminal.c
index feec70a4..b41eacda 100644
--- a/terminal.c
+++ b/terminal.c
@@ -628,6 +628,8 @@ void term_out(void) {
 		    scroll (marg_t, marg_b, 1, TRUE);
 		else if (curs_y < rows-1)
 		    curs_y++;
+                if (cfg.lfhascr)
+                    curs_x = 0;
 		fix_cpos;
 		wrapnext = FALSE;
 		disptop = scrtop;
@@ -1254,8 +1256,8 @@ void term_paint (Context ctx, int l, int t, int r, int b) {
     right = (r - 1) / font_width;
     top = t / font_height;
     bottom = (b - 1) / font_height;
-    for (i = top; i <= bottom && j<rows ; i++)
-      for (j = left; j <= right && j<cols ; j++)
+    for (i = top; i <= bottom && i < rows ; i++)
+      for (j = left; j <= right && j < cols ; j++)
 	    disptext[i*(cols+1)+j] = ATTR_INVALID;
 
     do_paint (ctx, FALSE);