Module Name: src
Committed By: blymn
Date: Fri Nov 4 06:12:23 UTC 2022
Modified Files:
src/lib/libcurses: move.c
Log Message:
PR bin/57072
This fixes observed behviour in the PR. Allow the cursor to be
moved one past the EOL, if postitioned here then set ISPASTEOL.
also protect out of range access if win->cury is past maxy.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/libcurses/move.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/move.c
diff -u src/lib/libcurses/move.c:1.24 src/lib/libcurses/move.c:1.25
--- src/lib/libcurses/move.c:1.24 Wed Apr 27 22:04:04 2022
+++ src/lib/libcurses/move.c Fri Nov 4 06:12:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: move.c,v 1.24 2022/04/27 22:04:04 blymn Exp $ */
+/* $NetBSD: move.c,v 1.25 2022/11/04 06:12:22 blymn Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)move.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: move.c,v 1.24 2022/04/27 22:04:04 blymn Exp $");
+__RCSID("$NetBSD: move.c,v 1.25 2022/11/04 06:12:22 blymn Exp $");
#endif
#endif /* not lint */
@@ -65,13 +65,17 @@ wmove(WINDOW *win, int y, int x)
__CTRACE(__CTRACE_MISC, "wmove: win %p, (%d, %d)\n", win, y, x);
if (x < 0 || y < 0)
return ERR;
- if (x >= win->maxx || y >= win->maxy)
+ if (x > win->maxx || y >= win->maxy)
return ERR;
/* clear the EOL flags for both where we were and where we are going */
- win->alines[win->cury]->flags &= ~ __ISPASTEOL;
+ if (win->cury < win->maxy)
+ win->alines[win->cury]->flags &= ~ __ISPASTEOL;
win->alines[y]->flags &= ~ __ISPASTEOL;
+ if (x == win->maxx)
+ win->alines[y]->flags |= __ISPASTEOL;
+
win->curx = x;
win->cury = y;
