diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-15 02:45:14 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-15 02:45:14 +0000 |
commit | 16652ad4ce7617d004a475de2631d64ee219ed16 (patch) | |
tree | 5d358bf75ecc378c734273a0baf917cf4ac5d982 | |
parent | 8c3658fd1b3d377158b53784652a72fc005321c2 (diff) | |
download | ruby-16652ad4ce7617d004a475de2631d64ee219ed16.tar.gz |
* marshal.c (r_bytes0): refined length check. [ruby-dev:32059]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | marshal.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Mon Oct 15 11:45:12 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * marshal.c (r_bytes0): refined length check. [ruby-dev:32059] + Mon Oct 15 10:24:19 2007 Tanaka Akira <akr@fsij.org> * process.c (pst_to_s): returns a string such as "pid 10220 exit 1" @@ -929,7 +929,7 @@ r_bytes0(long len, struct load_arg *arg) if (len == 0) return rb_str_new(0, 0); if (TYPE(arg->src) == T_STRING) { - if (RSTRING_LEN(arg->src) >= arg->offset + len) { + if (RSTRING_LEN(arg->src) - arg->offset >= len) { str = rb_str_new(RSTRING_PTR(arg->src)+arg->offset, len); arg->offset += len; } |