Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stricter parameter check for scrolling regions 

(PR kern/5954 by Dave Huang <khym@bga.com>)
This commit is contained in:
drochner 1998-08-12 20:04:12 +00:00
parent 8b950c2a65
commit 8e12b6c020
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/wscons/wsemul_vt100_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsemul_vt100_subr.c,v 1.3 1998/06/29 21:14:40 drochner Exp $ */
/* $NetBSD: wsemul_vt100_subr.c,v 1.4 1998/08/12 20:04:13 drochner Exp $ */
/*
* Copyright (c) 1998
@ -587,14 +587,14 @@ wsemul_vt100_handle_csi(edp, c)
}
break;
case 'r': /* DECSTBM set top/bottom margins */
if (ARG(0) == 0 && ARG(1) == 0) {
edp->scrreg_startrow = 0;
edp->scrreg_nrows = edp->nrows;
help = min(DEF1_ARG(0), edp->nrows) - 1;
n = min(DEFx_ARG(1, edp->nrows), edp->nrows) - help;
if (n < 2) {
/* minimal scrolling region has 2 lines */
return;
} else {
edp->scrreg_startrow = min(DEF1_ARG(0),
edp->nrows) - 1;
edp->scrreg_nrows = min(DEF1_ARG(1), edp->nrows) -
edp->scrreg_startrow;
edp->scrreg_startrow = help;
edp->scrreg_nrows = n;
}
edp->crow = ((edp->flags & VTFL_DECOM) ?
edp->scrreg_startrow : 0);

3
sys/dev/wscons/wsemul_vt100var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsemul_vt100var.h,v 1.2 1998/06/26 21:20:34 drochner Exp $ */
/* $NetBSD: wsemul_vt100var.h,v 1.3 1998/08/12 20:04:12 drochner Exp $ */
/*
* Copyright (c) 1998
@ -95,6 +95,7 @@ struct wsemul_vt100_emuldata {
/* some useful utility macros */
#define ARG(n) (edp->args[(n)])
#define DEF1_ARG(n) (ARG(n) ? ARG(n) : 1)
#define DEFx_ARG(n, x) (ARG(n) ? ARG(n) : (x))
#define ROWS_ABOVE (edp->crow - edp->scrreg_startrow)
#define ROWS_BELOW (edp->scrreg_startrow + edp->scrreg_nrows \
- edp->crow - 1)