From owner-p4-projects@FreeBSD.ORG  Sat Dec 27 20:45:06 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 89DCE1065676; Sat, 27 Dec 2008 20:45:06 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4D663106564A
	for <perforce@FreeBSD.org>; Sat, 27 Dec 2008 20:45:06 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E0B38FC1C
	for <perforce@FreeBSD.org>; Sat, 27 Dec 2008 20:45:06 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBRKj6i8094703
	for <perforce@FreeBSD.org>; Sat, 27 Dec 2008 20:45:06 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBRKj6Tw094701
	for perforce@freebsd.org; Sat, 27 Dec 2008 20:45:06 GMT
	(envelope-from ed@FreeBSD.org)
Date: Sat, 27 Dec 2008 20:45:06 GMT
Message-Id: <200812272045.mBRKj6Tw094701@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 155342 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Dec 2008 20:45:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=155342

Change 155342 by ed@ed_dull on 2008/12/27 20:44:49

	Fix crashes when panning up/down too many lines.

Affected files ...

.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#21 edit

Differences ...

==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#21 (text+ko) ====

@@ -96,7 +96,7 @@
 		/* Scroll down. */
 
 		/* Copy existing data up. */
-		if (t->t_scrollreg.ts_end - t->t_scrollreg.ts_begin > amount) {
+		if (t->t_scrollreg.ts_begin + amount < t->t_scrollreg.ts_end) {
 			tr.tr_begin.tp_row = t->t_scrollreg.ts_begin + amount;
 			tr.tr_begin.tp_col = 0;
 			tr.tr_end.tp_row = t->t_scrollreg.ts_end;
@@ -104,6 +104,10 @@
 			tp.tp_row = t->t_scrollreg.ts_begin;
 			tp.tp_col = 0;
 			teken_funcs_copy(t, &tr, &tp);
+
+			tr.tr_end.tp_row = t->t_scrollreg.ts_end - amount;
+		} else {
+			tr.tr_end.tp_row = t->t_scrollreg.ts_begin;
 		}
 
 		/* Clear the last lines. */
@@ -117,7 +121,7 @@
 		amount = -amount;
 
 		/* Copy existing data down. */
-		if (t->t_scrollreg.ts_end - t->t_scrollreg.ts_begin > amount) {
+		if (t->t_scrollreg.ts_begin + amount < t->t_scrollreg.ts_end) {
 			tr.tr_begin.tp_row = t->t_scrollreg.ts_begin;
 			tr.tr_begin.tp_col = 0;
 			tr.tr_end.tp_row = t->t_scrollreg.ts_end - amount;
@@ -125,12 +129,15 @@
 			tp.tp_row = t->t_scrollreg.ts_begin + amount;
 			tp.tp_col = 0;
 			teken_funcs_copy(t, &tr, &tp);
+
+			tr.tr_end.tp_row = t->t_scrollreg.ts_begin + amount;
+		} else {
+			tr.tr_end.tp_row = t->t_scrollreg.ts_end;
 		}
 
 		/* Clear the first lines. */
 		tr.tr_begin.tp_row = t->t_scrollreg.ts_begin;
 		tr.tr_begin.tp_col = 0;
-		tr.tr_end.tp_row = t->t_scrollreg.ts_begin + amount;
 		tr.tr_end.tp_col = t->t_winsize.tp_col;
 		teken_funcs_fill(t, &tr, BLANK, &t->t_curattr);
 	}