KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Abort if addWatch during initialization of poll data fails

Browse Source
This commit is contained in:
Kovid Goyal 2019-07-05 10:00:39 +05:30
parent 6d96a89328
commit a41ef8d513
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glfw/backend_utils.c vendored
View File

@ -229,15 +229,16 @@ drain_wakeup_fd(int fd, int events UNUSED, void* data UNUSED) {
bool bool
initPollData(EventLoopData *eld, int display_fd) { initPollData(EventLoopData *eld, int display_fd) {
addWatch(eld, "display", display_fd, POLLIN, 1, NULL, NULL); if (!addWatch(eld, "display", display_fd, POLLIN, 1, NULL, NULL)) return false;
#ifdef HAS_EVENT_FD #ifdef HAS_EVENT_FD
eld->wakeupFd = eventfd(0, 0); eld->wakeupFd = eventfd(0, 0);
if (eld->wakeupFd == -1) return false; if (eld->wakeupFd == -1) return false;
addWatch(eld, "wakeup", eld->wakeupFd, POLLIN, 1, drain_wakeup_fd, NULL); const int wakeup_fd = eld->wakeupFd;
#else #else
if (pipe2(eld->wakeupFds, O_CLOEXEC | O_NONBLOCK) != 0) return false; if (pipe2(eld->wakeupFds, O_CLOEXEC | O_NONBLOCK) != 0) return false;
addWatch(eld, "wakeup", eld->wakeupFds[0], POLLIN, 1, drain_wakeup_fd, NULL); const int wakeup_fd = eld->wakeupFds[0];
#endif #endif
if (!addWatch(eld, "wakeup", wakeup_fd, POLLIN, 1, drain_wakeup_fd, NULL)) return false;
return true; return true;
} }