diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | parse.y | 4 |
2 files changed, 10 insertions, 1 deletions
@@ -1,8 +1,15 @@ +Thu Mar 10 21:59:37 2011 NARUSE, Yui <naruse@ruby-lang.org> + + * 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 + Thu Mar 10 16:00:22 2011 NARUSE, Yui <naruse@ruby-lang.org> * 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 + Thu Mar 10 10:52:01 2011 NAKAMURA Usaku <usa@ruby-lang.org> * test/ruby/test_require.rb: setting too long string to ENV causes @@ -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; |