Changeset 98735eb in mainline for uspace/srv/hid/display/test/client.c

Timestamp:

2021-06-10T13:22:33Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

90f1f19

Parents:

d7f82635

git-author:

Jiri Svoboda <jiri@…> (2021-06-08 17:55:50)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-06-10 13:22:33)

Message:

Purge events from client event queue when destroying window

If the client had events queued for a particular window and that got
destroyed, later these events, pointing to freed (and reused) memory
would be handed to the client with the wrong window ID (which was
read from the wrong/recycled memory block).

File:

• uspace/srv/hid/display/test/client.c (modified) (1 diff)

uspace/srv/hid/display/test/client.c

@@ -553 +553 @@
 }
 
+/** Test ds_client_purge_window_events() */
+PCUT_TEST(client_purge_window_events)
+{
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_seat_t *seat;
+        ds_window_t *wnd;
+        display_wnd_params_t params;
+        ds_window_t *rwindow;
+        display_wnd_ev_t revent;
+        bool called_cb = NULL;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, df_none, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, &test_ds_client_cb, &called_cb, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, &seat);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 1;
+
+        rc = ds_window_create(client, &params, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        /* New window gets focused event */
+        PCUT_ASSERT_TRUE(called_cb);
+
+        /* Purge it */
+        ds_client_purge_window_events(client, wnd);
+
+        /* The queue should be empty now */
+        rc = ds_client_get_event(client, &rwindow, &revent);
+        PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
+
+        ds_window_destroy(wnd);
+        ds_seat_destroy(seat);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
 /** Test client being destroyed while still having a window.
  *