Changeset 87822ce in mainline for uspace/app/edit/edit.c

Timestamp:

2021-03-04T19:14:30Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d6c4d40

Parents:

760a392

Message:

Avoid infinite loop when console communication is broken

Need to make sure callers of console_get_event_timeout() can distinguish
between timeout and I/O error. Fix all callers of console_get_event()
and console_get_event_timeout() not to enter infinite loop when console
connection is broken. Also avoid setting of errno variable.

File:

• uspace/app/edit/edit.c (modified) (3 diffs)

uspace/app/edit/edit.c

@@ -251 +251 @@
 
         while (!done) {
-                console_get_event(con, &ev);
+                rc = console_get_event(con, &ev);
+                if (rc != EOK)
+                        break;
+
                 pane.rflags = 0;
 
@@ -634 +637 @@
         int nc;
         bool done;
+        errno_t rc;
 
         asprintf(&str, "%s: %s", prompt, init_value);
@@ -648 +652 @@
 
         while (!done) {
-                console_get_event(con, &ev);
+                rc = console_get_event(con, &ev);
+                if (rc != EOK)
+                        return NULL;
 
                 if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {