frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pending-fds' into 'master' 

xcb_in: Allow file descriptors to arrive early

See merge request xorg/lib/libxcb!24
This commit is contained in:
Julian Orth 2025-07-15 05:42:21 +02:00
parent 6a7661f60a 2b0c96c5ea
commit ce84e8e7b3
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/xcb_in.c
View File

@ -913,6 +913,7 @@ int _xcb_in_init(_xcb_in *in)
void _xcb_in_destroy(_xcb_in *in) void _xcb_in_destroy(_xcb_in *in)
{ {
int i;
pthread_cond_destroy(&in->event_cond); pthread_cond_destroy(&in->event_cond);
free_reply_list(in->current_reply); free_reply_list(in->current_reply);
_xcb_map_delete(in->replies, (void (*)(void *)) free_reply_list); _xcb_map_delete(in->replies, (void (*)(void *)) free_reply_list);
@ -929,6 +930,9 @@ void _xcb_in_destroy(_xcb_in *in)
in->pending_replies = pend->next; in->pending_replies = pend->next;
free(pend); free(pend);
} }
for(i = 0; i < in->in_fd.nfd; i++)
close(in->in_fd.fd[i]);
in->in_fd.nfd = 0;
} }
void _xcb_in_wake_up_next_reader(xcb_connection_t *c) void _xcb_in_wake_up_next_reader(xcb_connection_t *c)
@ -1048,18 +1052,6 @@ int _xcb_in_read(xcb_connection_t *c)
&c->in.in_fd.fd[c->in.in_fd.ifd], &c->in.in_fd.fd[c->in.in_fd.ifd],
c->in.in_fd.nfd * sizeof (int)); c->in.in_fd.nfd * sizeof (int));
c->in.in_fd.ifd = 0; c->in.in_fd.ifd = 0;
/* If we have any left-over file descriptors after emptying
* the input buffer, then the server sent some that we weren't
* expecting. Close them and mark the connection as broken;
*/
if (c->in.queue_len == 0 && c->in.in_fd.nfd != 0) {
int i;
for (i = 0; i < c->in.in_fd.nfd; i++)
close(c->in.in_fd.fd[i]);
_xcb_conn_shutdown(c, XCB_CONN_CLOSED_FDPASSING_FAILED);
return 0;
}
} }
#endif #endif
#ifndef _WIN32 #ifndef _WIN32