Changeset d9d6f29 in mainline

Timestamp:

2022-12-21T15:37:11Z (16 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

570a3f3

Parents:

4e7b0ad

git-author:

Jiri Svoboda <jiri@…> (2022-12-20 18:36:06)

git-committer:

Jiri Svoboda <jiri@…> (2022-12-21 15:37:11)

Message:

Roll back properly in error path of ds_display_add_ddev()

File:

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

uspace/srv/hid/display/display.c

@@ -644 +644 @@
 {
         errno_t rc;
+        gfx_rect_t old_disp_rect;
 
         assert(ddev->display == NULL);
         assert(!link_used(&ddev->lddevs));
+
+        old_disp_rect = disp->rect;
 
         ddev->display = disp;
@@ -658 +661 @@
                 /* Create cloning GC */
                 rc = ds_clonegc_create(ddev->gc, &disp->fbgc);
-                if (rc != EOK) {
-                        // XXX Remove output
-                        return ENOMEM;
-                }
+                if (rc != EOK)
+                        goto error;
 
                 /* Allocate backbuffer */
                 rc = ds_display_alloc_backbuf(disp);
                 if (rc != EOK) {
-                        // XXX Remove output
-                        // XXX Delete clone GC
+                        ds_clonegc_delete(disp->fbgc);
+                        disp->fbgc = NULL;
                         goto error;
                 }
@@ -681 +682 @@
         return EOK;
 error:
-        disp->rect.p0.x = 0;
-        disp->rect.p0.y = 0;
-        disp->rect.p1.x = 0;
-        disp->rect.p1.y = 0;
+        disp->rect = old_disp_rect;
         list_remove(&ddev->lddevs);
         return rc;