summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2018-04-02 16:41:13 +0100
committerAdam Jackson <ajax@redhat.com>2018-04-10 15:42:40 -0400
commit877fa0c66469628748dbd01506f15ddc4f11b849 (patch)
tree2de76fa1db347a9e3b28cd93e14b07e19da5cd1f
parent66b632bb068672f507212b00bd313b5040bf1a39 (diff)
xwayland: don't close() fds we don't own
The glamor_pixmap_from_fds error path erroneously closes the fds. We don't own them, plus the caller closes them after the function in called. Fixes: cef12efc15c ("glamor: Implement GetSupportedModifiers") Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com> Cc: Daniel Stone <daniels@collabora.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
-rw-r--r--hw/xwayland/xwayland-glamor.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 7f64483bf..6ba716263 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -704,8 +704,6 @@ glamor_pixmap_from_fds(ScreenPtr screen,
return pixmap;
error:
- for (i = 0; i < num_fds; i++)
- close(fds[i]);
return NULL;
}