summaryrefslogtreecommitdiffstats
path: root/marshal.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-15 02:45:14 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-15 02:45:14 +0000
commit135d3805e1277cb7ac8a8cbb48d57c764ce2cdc3 (patch)
tree5d358bf75ecc378c734273a0baf917cf4ac5d982 /marshal.c
parenta7ab3490fbf85d14974a9d95c549486194f8e76d (diff)
downloadruby-135d3805e1277cb7ac8a8cbb48d57c764ce2cdc3.tar.gz
ruby-135d3805e1277cb7ac8a8cbb48d57c764ce2cdc3.tar.xz
ruby-135d3805e1277cb7ac8a8cbb48d57c764ce2cdc3.zip
* marshal.c (r_bytes0): refined length check. [ruby-dev:32059]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r--marshal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/marshal.c b/marshal.c
index f442053c5..0590e28ed 100644
--- a/marshal.c
+++ b/marshal.c
@@ -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;
}