blob: b3f708292c469dae595da8502217e18711cb2873 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From 70bb9e28d37fff4ead4d0a2c672af77059765fa4 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed, 04 Jan 2012 18:33:29 +0000
Subject: Treat unexpected returned events from poll as errors
Inspired by libxcb's f0565e8f06aadf760a9065a97b8cf5ab9cbd18de
Resolves https://bugs.freedesktop.org/show_bug.cgi?id=20048
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
---
diff --git a/src/NextEvent.c b/src/NextEvent.c
index b1f7bc7..c8c9dd5 100644
--- a/src/NextEvent.c
+++ b/src/NextEvent.c
@@ -356,7 +356,21 @@ static int IoWait (
return Select (wf->nfds, &wf->rmask, &wf->wmask, &wf->emask,
wt->wait_time_ptr);
#else
- return poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
+ int ret = poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
+ /* If poll() returns an event we didn't expect, such as POLLNVAL, treat
+ * it as if it failed. */
+ if(ret >= 0) {
+ nfds_t i;
+ for (i=0; i < wf->fdlistlen; i++) {
+ struct pollfd *fd = &wf->fdlist[i];
+ if (fd->revents & ~fd->events) {
+ ret = -1;
+ errno = EIO;
+ break;
+ }
+ }
+ }
+ return ret;
#endif
}
--
cgit v0.9.0.2-2-gbebe
|
