Update to latest tinycompress
2b0410a compress: Must check for POLLERR before POLLOUT/POLLIN
Bug: 8174034.
Change-Id: I26a7bd4bf3999afbe99a2278a59304834980375e
diff --git a/compress.c b/compress.c
index 0e71c28..5cd0966 100644
--- a/compress.c
+++ b/compress.c
@@ -378,6 +378,9 @@
return total;
ret = poll(&fds, 1, compress->max_poll_wait_ms);
+ if (fds.revents & POLLERR) {
+ return oops(compress, EIO, "poll returned error!");
+ }
/* A pause will cause -EBADFD or zero.
* This is not an error, just stop writing */
if ((ret == 0) || (ret == -EBADFD))
@@ -387,9 +390,6 @@
if (fds.revents & POLLOUT) {
continue;
}
- if (fds.revents & POLLERR) {
- return oops(compress, EIO, "poll returned error!");
- }
}
/* write avail bytes */
if (size > avail.avail)
@@ -438,6 +438,9 @@
return total;
ret = poll(&fds, 1, compress->max_poll_wait_ms);
+ if (fds.revents & POLLERR) {
+ return oops(compress, EIO, "poll returned error!");
+ }
/* A pause will cause -EBADFD or zero.
* This is not an error, just stop reading */
if ((ret == 0) || (ret == -EBADFD))
@@ -447,9 +450,6 @@
if (fds.revents & POLLIN) {
continue;
}
- if (fds.revents & POLLERR) {
- return oops(compress, EIO, "poll returned error!");
- }
}
/* read avail bytes */
if (size > avail.avail)
@@ -616,15 +616,15 @@
fds.events = POLLOUT | POLLIN;
ret = poll(&fds, 1, timeout_ms);
+ if (fds.revents & POLLERR) {
+ return oops(compress, EIO, "poll returned error!");
+ }
/* A pause will cause -EBADFD or zero. */
if ((ret < 0) && (ret != -EBADFD))
return oops(compress, errno, "poll error");
if (fds.revents & (POLLOUT | POLLIN)) {
return 0;
}
- if (fds.revents & POLLERR) {
- return oops(compress, EIO, "poll returned error!");
- }
return ret;
}
