diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2020-01-26 13:27:51 +0200 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2020-01-26 13:27:51 +0200 |
| commit | 3333ba4a6795a55cf0375329ba08152bd7fcbd46 (patch) | |
| tree | 367720287156169c1b7ec71518a8427a12d3a5f3 | |
| parent | Use $(LIB_FUZZING_ENGINE) in tests/ossfuzz/Makefile. (diff) | |
| download | xz-3333ba4a6795a55cf0375329ba08152bd7fcbd46.tar.xz | |
xz: Move the setting of flush_needed in file_io.c to a nicer location.
| -rw-r--r-- | src/xz/file_io.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/xz/file_io.c b/src/xz/file_io.c index c48df6e4..83bf1511 100644 --- a/src/xz/file_io.c +++ b/src/xz/file_io.c @@ -266,11 +266,8 @@ io_wait(file_pair *pair, int timeout, bool is_reading) return IO_WAIT_ERROR; } - if (ret == 0) { - assert(opt_flush_timeout != 0); - flush_needed = true; + if (ret == 0) return IO_WAIT_TIMEOUT; - } if (pfd[0].revents != 0) return IO_WAIT_MORE; @@ -1147,6 +1144,7 @@ io_read(file_pair *pair, io_buf *buf_union, size_t size) return SIZE_MAX; case IO_WAIT_TIMEOUT: + flush_needed = true; return size - left; default: |