40 lines
1.8 KiB
Diff
40 lines
1.8 KiB
Diff
|
diff -up cups-1.4.2/scheduler/select.c.CVE-2009-3553 cups-1.4.2/scheduler/select.c
|
||
|
|
--- cups-1.4.2/scheduler/select.c.CVE-2009-3553 2009-07-15 00:07:52.000000000 +0100
|
||
|
|
+++ cups-1.4.2/scheduler/select.c 2009-11-19 12:30:39.672976150 +0000
|
||
|
|
@@ -454,7 +454,7 @@ cupsdDoSelect(long timeout) /* I - Time
|
||
|
|
if (fdptr->read_cb && event->filter == EVFILT_READ)
|
||
|
|
(*(fdptr->read_cb))(fdptr->data);
|
||
|
|
|
||
|
|
- if (fdptr->write_cb && event->filter == EVFILT_WRITE)
|
||
|
|
+ if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE)
|
||
|
|
(*(fdptr->write_cb))(fdptr->data);
|
||
|
|
|
||
|
|
release_fd(fdptr);
|
||
|
|
@@ -499,7 +499,7 @@ cupsdDoSelect(long timeout) /* I - Time
|
||
|
|
if (fdptr->read_cb && (event->events & (EPOLLIN | EPOLLERR | EPOLLHUP)))
|
||
|
|
(*(fdptr->read_cb))(fdptr->data);
|
||
|
|
|
||
|
|
- if (fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
|
||
|
|
+ if (fdptr->use > 1 && fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
|
||
|
|
(*(fdptr->write_cb))(fdptr->data);
|
||
|
|
|
||
|
|
release_fd(fdptr);
|
||
|
|
@@ -590,7 +590,7 @@ cupsdDoSelect(long timeout) /* I - Time
|
||
|
|
if (fdptr->read_cb && (pfd->revents & (POLLIN | POLLERR | POLLHUP)))
|
||
|
|
(*(fdptr->read_cb))(fdptr->data);
|
||
|
|
|
||
|
|
- if (fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
|
||
|
|
+ if (fdptr->use > 1 && fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
|
||
|
|
(*(fdptr->write_cb))(fdptr->data);
|
||
|
|
|
||
|
|
release_fd(fdptr);
|
||
|
|
@@ -645,7 +645,7 @@ cupsdDoSelect(long timeout) /* I - Time
|
||
|
|
if (fdptr->read_cb && FD_ISSET(fdptr->fd, &cupsd_current_input))
|
||
|
|
(*(fdptr->read_cb))(fdptr->data);
|
||
|
|
|
||
|
|
- if (fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output))
|
||
|
|
+ if (fdptr->use > 1 && fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output))
|
||
|
|
(*(fdptr->write_cb))(fdptr->data);
|
||
|
|
|
||
|
|
release_fd(fdptr);
|