aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-20 06:09:03 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-20 06:09:03 +0000
commit64ba5303fd885833697f026cffbeb6f98bc8ed7b (patch)
tree7e96a157461b2818df6e902eeeec61fe39834075
parentd7e4c1e66b65fdb70a71b9aaf687bf77055a4f15 (diff)
downloadruby-64ba5303fd885833697f026cffbeb6f98bc8ed7b.tar.gz
* parse.y (parser_read_escape): has8bit flag may be set with control
escape. [ruby-core:13722] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13981 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index da9bf7fa53..e4aec4f619 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Tue Nov 20 15:08:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Nov 20 15:09:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_read_escape): has8bit flag may be set with control
+ escape. [ruby-core:13722]
* parse.y (parser_prepare): set begging after BOM if exists.
[ruby-core:13718]
diff --git a/parse.y b/parse.y
index 696ff6312d..fdd17f0aa0 100644
--- a/parse.y
+++ b/parse.y
@@ -5144,7 +5144,7 @@ parser_read_escape(struct parser_params *parser, int flags,
if (flags & ESCAPE_CONTROL) goto eof;
if ((c = nextc())== '\\') {
int tmp;
- c = read_escape(flags|ESCAPE_CONTROL, &tmp, &tmp, encp);
+ c = read_escape(flags|ESCAPE_CONTROL, has8bit, &tmp, encp);
}
else if (c == '?')
return 0177;