Mesa (master): glx/drisw: return false if shmid == -1

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 246e4aeaef4c1f1071c64e9681fc9229aac22020
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=246e4aeaef4c1f1071c64e9681fc9229aac22020

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Feb 24 10:19:51 2020 +1000

glx/drisw: return false if shmid == -1

If an attempt to create an shm pixmap in XCreateDrawable fails
then it ends up with the shmid == -1. This means the get image
path needs to fallback so return false in this case to use the
non-shm get image path.

Fixes: 02c3dad0f3b4 ("Call shmget() with permission 0600 instead of 0777")

Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3823>

---

 src/glx/drisw_glx.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 6e37f0274b0..dfa3218d759 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -303,6 +303,9 @@ swrastGetImageShm2(__DRIdrawable * read,
       if (!XCreateDrawable(prp, shmid, dpy))
          return GL_FALSE;
    }
+
+   if (prp->shminfo.shmid == -1)
+      return GL_FALSE;
    readable = pread->xDrawable;
 
    ximage = prp->ximage;