1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve error handling in finish_writeconv.

Browse Source
This commit is contained in:
Samuel Williams 2022-05-09 22:21:47 +12:00
parent c6cd9e180e
commit ac499bb511
Notes: git 2022-05-28 12:44:45 +09:00 
Merged: https://github.com/ruby/ruby/pull/5419
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
io.c
View File

@ -5143,7 +5143,6 @@ finish_writeconv(rb_io_t *fptr, int noalloc)
if (!fptr->wbuf.ptr) { if (!fptr->wbuf.ptr) {
unsigned char buf[1024]; unsigned char buf[1024];
long r;
res = econv_destination_buffer_full; res = econv_destination_buffer_full;
while (res == econv_destination_buffer_full) { while (res == econv_destination_buffer_full) {
@ -5151,19 +5150,20 @@ finish_writeconv(rb_io_t *fptr, int noalloc)
de = buf + sizeof(buf); de = buf + sizeof(buf);
res = rb_econv_convert(fptr->writeconv, NULL, NULL, &dp, de, 0); res = rb_econv_convert(fptr->writeconv, NULL, NULL, &dp, de, 0);
while (dp-ds) { while (dp-ds) {
retry: size_t remaining = dp-ds;
r = rb_write_internal(fptr, ds, dp-ds); long result = rb_write_internal(fptr, ds, remaining);
if (r == dp-ds)
break; if (result >= 0) {
if (0 <= r) { ds += result;
ds += r; if ((size_t)result == remaining) break;
} }
if (rb_io_maybe_wait_writable(errno, fptr->self, Qnil)) { else if (rb_io_maybe_wait_writable(errno, fptr->self, Qnil)) {
if (fptr->fd < 0) if (fptr->fd < 0)
return noalloc ? Qtrue : rb_exc_new3(rb_eIOError, rb_str_new_cstr(closed_stream)); return noalloc ? Qtrue : rb_exc_new3(rb_eIOError, rb_str_new_cstr(closed_stream));
goto retry;
} }
return noalloc ? Qtrue : INT2NUM(errno); else {
return noalloc ? Qtrue : INT2NUM(errno);
}
} }
if (res == econv_invalid_byte_sequence || if (res == econv_invalid_byte_sequence ||
res == econv_incomplete_input || res == econv_incomplete_input ||
@ -5178,8 +5178,9 @@ finish_writeconv(rb_io_t *fptr, int noalloc)
res = econv_destination_buffer_full; res = econv_destination_buffer_full;
while (res == econv_destination_buffer_full) { while (res == econv_destination_buffer_full) {
if (fptr->wbuf.len == fptr->wbuf.capa) { if (fptr->wbuf.len == fptr->wbuf.capa) {
if (io_fflush(fptr) < 0) if (io_fflush(fptr) < 0) {
return noalloc ? Qtrue : INT2NUM(errno); return noalloc ? Qtrue : INT2NUM(errno);
}
} }
ds = dp = (unsigned char *)fptr->wbuf.ptr + fptr->wbuf.off + fptr->wbuf.len; ds = dp = (unsigned char *)fptr->wbuf.ptr + fptr->wbuf.off + fptr->wbuf.len;