Fill up entire buffer

Author: rhpvorderman

src/isal/isal_zlibmodule.c

@@ -1465,9 +1465,11 @@ IGzipReader_read_into_buffer(IGzipReader *self, uint8_t *out_buffer, size_t out_
                 size_t current_bytes_written = self->state.next_out - out_buffer;
                 bytes_written += current_bytes_written;
                 self->_pos += current_bytes_written;
+                out_buffer = self->state.next_out;
+                out_buffer_size = self->state.avail_out;
                 current_pos = self->state.next_in;
                 if (!(self->state.block_state == ISAL_BLOCK_FINISH)) {
-                    if (bytes_written == 0) {
+                    if (self->state.avail_out > 0) {
                         break;
                     }
                     self->current_pos = current_pos;
@@ -1476,8 +1478,6 @@ IGzipReader_read_into_buffer(IGzipReader *self, uint8_t *out_buffer, size_t out_
                 current_pos -= bitbuffer_size(&self->state);
                 // Block done check trailer.
                 self->stream_phase = IGZIPREADER_TRAILER;
-                self->current_pos = current_pos;
-                return bytes_written;
             case IGZIPREADER_TRAILER:
                 if (buffer_end - current_pos < 8) {
                     break;
@@ -1520,7 +1520,8 @@ IGzipReader_read_into_buffer(IGzipReader *self, uint8_t *out_buffer, size_t out_
         if (self->all_bytes_read) {
             if (self->stream_phase == IGZIPREADER_NULL_BYTES) {
                 self->_size = self->_pos;
-                return 0;
+                self->current_pos = current_pos;
+                return bytes_written;
             }
             PyErr_SetString(PyExc_EOFError, EOF_MESSAGE);
             return -1;