summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-28 23:32:19 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-28 23:32:19 +0000
commit9eb4b2e57beea49ebaa5cf31592de55bd15753df (patch)
tree7aa7aae388363b77dcf03cec1311750e8bf6793a /parse.y
parent394c7da441c369dc6b73842425be4e5df38dd5e0 (diff)
merges r31085 from trunk into ruby_1_9_2.
-- * parse.y (parser_encode_length): fix typo: the length of "-dos" and "-mac" is not 5 but 4. patched by James M. Lawrence [ruby-core:35476] fixes #4489 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y2
1 files changed, 1 insertions, 1 deletions
diff --git a/parse.y b/parse.y
index 7a0766d903..ead771a2a0 100644
--- a/parse.y
+++ b/parse.y
@@ -6220,7 +6220,7 @@ parser_encode_length(struct parser_params *parser, const char *name, long len)
if (rb_memcicmp(name + nlen + 1, "unix", 4) == 0)
return nlen;
}
- if (len > 4 && name[nlen = len - 5] == '-') {
+ if (len > 4 && name[nlen = len - 4] == '-') {
if (rb_memcicmp(name + nlen + 1, "dos", 3) == 0)
return nlen;
if (rb_memcicmp(name + nlen + 1, "mac", 3) == 0)