diff options
author | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-28 08:49:25 +0000 |
---|---|---|
committer | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-28 08:49:25 +0000 |
commit | dd8f7a6cfdce76078c1deb3d39e6f95edc1283c1 (patch) | |
tree | 1d6e283be15036c03e852f1f834bb7d3bda297aa /io.c | |
parent | 0a7785431c05d6b1854af94465f49c6b6d27a304 (diff) |
* string.c: add internal API rb_str_locktmp_ensure().
* io.c (io_fread): use rb_str_locktmp_ensure().
[ruby-core:56121] [Bug #8669]
* test/ruby/test_io.rb: add a test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 23 |
1 files changed, 20 insertions, 3 deletions
@@ -2061,15 +2061,32 @@ io_bufread(char *ptr, long len, rb_io_t *fptr) static void io_setstrbuf(VALUE *str, long len); +struct bufread_arg { + char *str_ptr; + long len; + rb_io_t *fptr; +}; + +static VALUE +bufread_call(VALUE arg) +{ + struct bufread_arg *p = (struct bufread_arg *)arg; + p->len = io_bufread(p->str_ptr, p->len, p->fptr); + return Qundef; +} + static long io_fread(VALUE str, long offset, long size, rb_io_t *fptr) { long len; + struct bufread_arg arg; io_setstrbuf(&str, offset + size); - rb_str_locktmp(str); - len = io_bufread(RSTRING_PTR(str) + offset, size, fptr); - rb_str_unlocktmp(str); + arg.str_ptr = RSTRING_PTR(str) + offset; + arg.len = size; + arg.fptr = fptr; + rb_str_locktmp_ensure(str, bufread_call, (VALUE)&arg); + len = arg.len; if (len < 0) rb_sys_fail_path(fptr->pathv); return len; } |