diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-10 13:07:03 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-10 13:07:03 +0000 |
| commit | f1b2fb67061ee2fa15a04e8777bcb55790a9dd5c (patch) | |
| tree | c1d0cde82aec9346feb3ba2605b402177f522f04 /parse.y | |
| parent | eb778a7b6bfb16f4dd5f1a682ff0dc3dcb31e0f3 (diff) | |
* parse.y (parser_encode_length): add exception as UTF8-MAC for
magic comment's emacs newline specifier
patched by James M. Lawrence [ruby-core:35476] fixes #4489
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -6233,7 +6233,9 @@ parser_encode_length(struct parser_params *parser, const char *name, long len) 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) + if (rb_memcicmp(name + nlen + 1, "mac", 3) == 0 && + !(len == 8 && rb_memcicmp(name, "utf8-mac", len) == 0)) + /* exclude UTF8-MAC because the encoding named "UTF8" doesn't exist in Ruby */ return nlen; } return len; |