Changeset 68f1254c in mainline

Timestamp:

2018-12-30T11:49:13Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e8d3165e

Parents:

59cce22

Message:

Terminal/console need to handle invalid coordinates

chargrid_set_cursor asserted that arguments are valid yet they are passed
directly from client by terminal/console. Chargrid is probably best
positioned to validate the agruments so instead of assert, check
the arguments and don't do anything if they are invalid.

tinput was clearly forgetting about some cases where the screen could have
scrolled so simply call tinput_update_origin every time from
tinput_position_caret. This was happenning when the input line was
longer than one screen row and tab completion was invoked
(which caused assertion failure in chargrid).

Location:

uspace/lib

Files:

• c/generic/io/chargrid.c (modified) (1 diff)
• clui/tinput.c (modified) (5 diffs)

uspace/lib/c/generic/io/chargrid.c

@@ -263 +263 @@
 void chargrid_set_cursor(chargrid_t *scrbuf, sysarg_t col, sysarg_t row)
 {
+        if (col >= scrbuf->cols || row >= scrbuf->rows)
+                return;
+
         scrbuf->col = col;
         scrbuf->row = row;

uspace/lib/clui/tinput.c

@@ -56 +56 @@
 } seek_dir_t;
 
+static void tinput_update_origin(tinput_t *);
 static void tinput_init(tinput_t *);
 static void tinput_insert_string(tinput_t *, const char *);
@@ -71 +72 @@
 static void tinput_console_set_lpos(tinput_t *ti, unsigned lpos)
 {
-        console_set_pos(ti->console, LIN_TO_COL(ti, lpos),
-            LIN_TO_ROW(ti, lpos));
+        unsigned col = LIN_TO_COL(ti, lpos);
+        unsigned row = LIN_TO_ROW(ti, lpos);
+
+        assert(col < ti->con_cols);
+        assert(row < ti->con_rows);
+        console_set_pos(ti->console, col, row);
 }
 
@@ -163 +168 @@
 static void tinput_position_caret(tinput_t *ti)
 {
+        tinput_update_origin(ti);
         tinput_console_set_lpos(ti, ti->text_coord + ti->pos);
 }
@@ -232 +238 @@
 
         tinput_display_tail(ti, ti->pos - 1, 0);
-        tinput_update_origin(ti);
         tinput_position_caret(ti);
 }
@@ -276 +281 @@
 
         tinput_display_tail(ti, ti->pos - ilen, 0);
-        tinput_update_origin(ti);
         tinput_position_caret(ti);
 }