vo_xv, vo_x11: make use of XShm 1.2 #16153
Conversation
| dependency('xrandr', version: '>= 1.4.0', required: x11_opt), | ||
| dependency('x11-xcb', version: '>= 1.8.9', required: x11_opt), | ||
| dependency('xcb-shm', version: '>= 1.16', required: x11_opt), | ||
| dependency('xcb', version: '>= 1.16', required: x11_opt),] |
There was a problem hiding this comment.
This isn't available on Debian Stable, and considering the whole purpose of this VO is for compatibility with old systems, I'm not sure we want to require this to build X11 at all. Can this be an optional dep?
There was a problem hiding this comment.
XCB only seems to be used for a single call that could probably be done without XCB.
| p->myximage[foo]->height, | ||
| IPC_CREAT | 0777); | ||
| len = p->myximage[foo]->bytes_per_line * p->myximage[foo]->height; | ||
| memcpy(p->shmname, "/tmp/mpv-x11-XXXXXXXXXX", sizeof(p->shmname)); |
There was a problem hiding this comment.
This should be memfd_create and on platforms that doesn't support it, it should be made as a platform specific impl in osdep.
| p->Shminfo[foo].shmaddr = (char *) shmat(p->Shminfo[foo].shmid, 0, 0); | ||
| p->Shminfo[foo].shmaddr = mmap(NULL, len, | ||
| PROT_READ | PROT_WRITE, | ||
| MAP_SHARED | __MAP_NOFAULT, |
There was a problem hiding this comment.
flag seems to be openbsd-specific
| IPC_CREAT | 0777); | ||
| len = p->myximage[foo]->bytes_per_line * p->myximage[foo]->height; | ||
| memcpy(p->shmname, "/tmp/mpv-x11-XXXXXXXXXX", sizeof(p->shmname)); | ||
| p->Shminfo[foo].shmid = shm_mkstemp(p->shmname); |
There was a problem hiding this comment.
another function that does not exist on Linux
There was a problem hiding this comment.
Yes, I was not aware of this being an extension function until after it went through CI.
| PROT_READ | PROT_WRITE, | ||
| MAP_SHARED | __MAP_NOFAULT, | ||
| p->Shminfo[foo].shmid, 0); | ||
| ftruncate(p->Shminfo[foo].shmid, len); |
There was a problem hiding this comment.
shouldn't this happen before you map it?
| shminfo->shmseg = xcb_generate_id(xcb_conn); | ||
| xcb_shm_attach_fd(xcb_conn, shminfo->shmseg, shminfo->shmid, | ||
| shminfo->readOnly); | ||
| return 1; |
| IPC_CREAT | 0777); | ||
| ctx->Shminfo[foo].shmaddr = shmat(ctx->Shminfo[foo].shmid, 0, 0); | ||
| memcpy(ctx->shmname, "/tmp/mpv-xv-XXXXXXXXXX", | ||
| sizeof(ctx->shmname)); |
There was a problem hiding this comment.
this is an OOB-read because the string is surely smaller than the destination buffer
There was a problem hiding this comment.
most secure OpenBSD code
| dependency('xrandr', version: '>= 1.4.0', required: x11_opt), | ||
| dependency('x11-xcb', version: '>= 1.8.9', required: x11_opt), | ||
| dependency('xcb-shm', version: '>= 1.16', required: x11_opt), | ||
| dependency('xcb', version: '>= 1.16', required: x11_opt),] |
There was a problem hiding this comment.
XCB only seems to be used for a single call that could probably be done without XCB.
|
What's the motivation for this anyways? The commit message doesn't really mention anything. |
No description provided.