xserver: Branch 'master' - 3 commits

[GitLab Mirror]

 hw/xfree86/fbdevhw/fbdevhw.c            |    2 +-
 hw/xwayland/xwayland-glamor-eglstream.c |    8 ++++++--
 hw/xwayland/xwayland-glamor.c           |    9 ++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 7c25439f0db4c20a4eab4ed44262eb396305f58a
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Oct 16 10:37:16 2018 +1000

    xwayland: fix a realloc OOM error case
    
    Found by coverity
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
index 9950be94d..c62c0d2ac 100644
--- a/hw/xwayland/xwayland-glamor-eglstream.c
+++ b/hw/xwayland/xwayland-glamor-eglstream.c
@@ -196,7 +196,7 @@ xwl_glamor_egl_supports_device_probing(void)
 static void **
 xwl_glamor_egl_get_devices(int *num_devices)
 {
-    EGLDeviceEXT *devices;
+    EGLDeviceEXT *devices, *tmp;
     Bool ret;
     int drm_dev_count = 0;
     int i;
@@ -233,7 +233,11 @@ xwl_glamor_egl_get_devices(int *num_devices)
         goto error;
 
     *num_devices = drm_dev_count;
-    devices = realloc(devices, sizeof(EGLDeviceEXT) * drm_dev_count);
+    tmp = realloc(devices, sizeof(EGLDeviceEXT) * drm_dev_count);
+    if (!tmp)
+        goto error;
+
+    devices = tmp;
 
     return devices;
 
commit bd5fe7593fd0df236f3b2be1f062166ddba7d67c
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Oct 16 09:42:51 2018 +1000

    xfree86: fix readlink call
    
    Misplaced parenthesis caused us to compare the sizeof, not the readlink return
    value.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index 3fb1d2bba..95089515c 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -336,7 +336,7 @@ fbdev_open(int scrnIndex, const char *dev, char **namep)
         char *node = strrchr(dev, '/') + 1;
 
         if (asprintf(&sysfs_path, "/sys/class/graphics/%s", node) < 0 ||
-            readlink(sysfs_path, buf, sizeof(buf) < 0) ||
+            readlink(sysfs_path, buf, sizeof(buf)) < 0 ||
             strstr(buf, "devices/pci")) {
             free(sysfs_path);
             close(fd);
commit dda2323d239a48e50ac9fd6617d7b630d8a14235
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Oct 16 09:39:54 2018 +1000

    xwayland: make a if noop clearer to the compiler/coverity
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 7ea6def61..f4bd561ea 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -77,13 +77,16 @@ xwl_glamor_init_wl_registry(struct xwl_screen *xwl_screen,
                                                  registry,
                                                  id,
                                                  interface,
-                                                 version)); /* no-op */
-    else if (xwl_screen->eglstream_backend.is_available &&
+                                                 version)) {
+        /* no-op */
+    } else if (xwl_screen->eglstream_backend.is_available &&
              xwl_screen->eglstream_backend.init_wl_registry(xwl_screen,
                                                             registry,
                                                             id,
                                                             interface,
-                                                            version)); /* no-op */
+                                                            version)) {
+        /* no-op */
+    }
 }
 
 Bool