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 | 82e25d333807accc280d3d03486dfdec4184bf6b (patch) | |
tree | 4c9e2881ff7e8bceb07f718d6b8e0237bc0765ff | |
parent | 96d9ae7030b8069f8854b250bfd0694aa6a25821 (diff) |
* marshal.c (r_bytes0): refined length check. [ruby-dev:32059]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@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 09:58:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * marshal.c (r_bytes0): check if source has enough data. @@ -873,7 +873,7 @@ r_bytes0(len, arg) if (len == 0) return rb_str_new(0, 0); if (TYPE(arg->src) == T_STRING) { - if (RSTRING(arg->src)->len >= arg->offset + len) { + if (RSTRING(arg->src)->len - arg->offset >= len) { str = rb_str_new(RSTRING(arg->src)->ptr+arg->offset, len); arg->offset += len; } |