* io.c (fill_cbuf): Fix test-all crash.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
8858722dbd
commit
78271e8c72
@ -1,3 +1,7 @@
|
|||||||
|
Sat May 28 02:06:26 2011 KOSAKI Motohiro <kosaki@KOSAKI-Motohiro-no-MacBook-Pro.local>
|
||||||
|
|
||||||
|
* io.c (fill_cbuf): Fix test-all crash.
|
||||||
|
|
||||||
Sat May 28 00:58:40 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
|
Sat May 28 00:58:40 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
|
||||||
|
|
||||||
* lib/ostruct.rb (method_missing): Handle [] and []= correctly.
|
* lib/ostruct.rb (method_missing): Handle [] and []= correctly.
|
||||||
|
3
io.c
3
io.c
@ -1715,11 +1715,12 @@ fill_cbuf(rb_io_t *fptr, int ec_flags)
|
|||||||
res = rb_econv_convert(fptr->readconv, NULL, NULL, &dp, de, 0);
|
res = rb_econv_convert(fptr->readconv, NULL, NULL, &dp, de, 0);
|
||||||
fptr->cbuf.len += (int)(dp - ds);
|
fptr->cbuf.len += (int)(dp - ds);
|
||||||
rb_econv_check_error(fptr->readconv);
|
rb_econv_check_error(fptr->readconv);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return MORE_CHAR_FINISHED;
|
||||||
}
|
}
|
||||||
|
|
||||||
static VALUE
|
static VALUE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user