Changeset dbf5d7c in mainline for uspace/srv/hid/display/main.c

Timestamp:

2020-06-22T17:32:27Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2fc1e6d

Parents:

56dcf53

git-author:

Jiri Svoboda <jiri@…> (2020-06-22 17:31:21)

git-committer:

Jiri Svoboda <jiri@…> (2020-06-22 17:32:27)

Message:

Only initialize input after we have probed for display devices

Avoids null pointer dereference (null GC) that could occur if an input event
arrived earlier than we could initialize a display device.

File:

• uspace/srv/hid/display/main.c (modified) (2 diffs)

uspace/srv/hid/display/main.c

@@ -102 +102 @@
                 goto error;
 
-        rc = ds_input_open(disp);
-        if (rc != EOK)
-                goto error;
-
         rc = ds_output_create(&output);
         if (rc != EOK)
@@ -112 +108 @@
         output->def_display = disp;
         rc = ds_output_start_discovery(output);
+        if (rc != EOK)
+                goto error;
+
+        rc = ds_input_open(disp);
         if (rc != EOK)
                 goto error;