Changeset f5191b4 in mainline for uspace/srv/hid/display/window.c

Timestamp:

2020-01-28T09:17:35Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4645b2c

Parents:

cc90846

git-author:

Jiri Svoboda <jiri@…> (2020-01-27 19:17:32)

git-committer:

Jiri Svoboda <jiri@…> (2020-01-28 09:17:35)

Message:

Fix unit test failures

File:

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

uspace/srv/hid/display/window.c

@@ -301 +301 @@
                 wnd->pixelmap.height = dims.y;
                 wnd->pixelmap.data = alloc.pixels;
-        }
-
-        if (wnd->pixelmap.data == NULL) {
-                rc = ENOMEM;
-                goto error;
+
+                if (wnd->pixelmap.data == NULL) {
+                        rc = ENOMEM;
+                        goto error;
+                }
         }
 
@@ -382 +382 @@
         }
 
+        /* This can happen in unit tests */
+        if (wnd->bitmap == NULL)
+                return EOK;
+
         return gfx_bitmap_render(wnd->bitmap, brect, &wnd->dpos);
 }