From bd9b65c7083552fdde22e1d80a8cabd0b4601a6f Mon Sep 17 00:00:00 2001
From: Ali Gholami Rudi <ali@rudi.ir>
Date: Sat, 7 Apr 2012 20:50:03 +0430
Subject: [PATCH] term: handle bad csi sequences

This fixes entering an infinite loop when there is a colon
in a csi sequence.
---
 term.c | 22 +++++++++++-----------
 util.h |  1 +
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/term.c b/term.c
index 58f3a16..66415f1 100644
--- a/term.c
+++ b/term.c
@@ -466,16 +466,16 @@ static void move_cursor(int r, int c)
 	draw_cursor(0);
 	t = origin() ? top : 0;
 	b = origin() ? bot : pad_rows();
-	row = MAX(t, MIN(r, b - 1));
-	col = MAX(0, MIN(c, pad_cols() - 1));
+	row = LIMIT(r, t, b - 1);
+	col = LIMIT(c, 0, pad_cols() - 1);
 	draw_cursor(1);
 	mode = BIT_SET(mode, MODE_WRAPREADY, 0);
 }
 
 static void set_region(int t, int b)
 {
-	top = MIN(pad_rows() - 1, MAX(0, t - 1));
-	bot = MIN(pad_rows(), MAX(top + 1, b ? b : pad_rows()));
+	top = LIMIT(t - 1, 0, pad_rows() - 1);
+	bot = LIMIT(b ? b : pad_rows(), top + 1, pad_rows());
 	if (origin())
 		move_cursor(top, 0);
 }
@@ -555,8 +555,8 @@ static void advance(int dr, int dc, int scrl)
 		int nr = (bot - top) - n;
 		scroll_screen(top, nr, n);
 	}
-	r = dr ? MIN(bot - 1, MAX(top, r)) : r;
-	c = MIN(pad_cols() - 1, MAX(0, c));
+	r = dr ? LIMIT(r, top, bot - 1) : r;
+	c = LIMIT(c, 0, pad_cols() - 1);
 	move_cursor(r, c);
 }
 
@@ -819,10 +819,10 @@ static void csiseq(void)
 			arg = arg * 10 + (c - '0');
 			c = readpty();
 		}
-		if (c == ';')
+		if (CSIP(c))
 			c = readpty();
-		args[n] = arg;
-		n = n < ARRAY_SIZE(args) ? n + 1 : 0;
+		if (n < ARRAY_SIZE(args))
+			args[n++] = arg;
 	}
 	while (CSII(c))
 		c = readpty();
@@ -905,10 +905,10 @@ static void csiseq(void)
 			modeseq(priv == '?' ? args[i] | 0x80 : args[i], 0);
 		break;
 	case 'P':	/* DCH		delete characters on current line */
-		delete_chars(MIN(MAX(1, args[0]), pad_cols() - col));
+		delete_chars(LIMIT(args[0], 1, pad_cols() - col));
 		break;
 	case '@':	/* ICH		insert blank characters */
-		insert_chars(MAX(1, args[0]));
+		insert_chars(LIMIT(args[0], 1, pad_cols() - col));
 		break;
 	case 'n':	/* DSR		device status report */
 		csiseq_dsr(args[0]);
diff --git a/util.h b/util.h
index 4968294..38430a7 100644
--- a/util.h
+++ b/util.h
@@ -1,3 +1,4 @@
 #define ARRAY_SIZE(a)	(sizeof(a) / sizeof((a)[0]))
 #define MIN(a, b)	((a) < (b) ? (a) : (b))
 #define MAX(a, b)	((a) > (b) ? (a) : (b))
+#define LIMIT(n, a, b)	((n) < (a) ? (a) : ((n) > (b) ? (b) : (n)))
-- 
2.11.4.GIT