xserver: Branch 'server-1.20-branch'

[GitLab Mirror]

 hw/xfree86/fbdevhw/fbdevhw.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cfc3dec09e1a56bb050ba31bde0bbf499596063a
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>
    (cherry picked from commit bd5fe7593fd0df236f3b2be1f062166ddba7d67c)

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);