nobu	2007-11-19 01:53:12 +0900 (Mon, 19 Nov 2007)

  New Revision: 13962

  Modified files:
    trunk/ChangeLog
    trunk/parse.y
    trunk/version.h

  Log:
    * parse.y (parser_read_escape): disallow control and meta modifiers
      for non-ASCII characters.  [ruby-core:13685]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=13962&r2=13961
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/parse.y?r1=13962&r2=13961
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13962&r2=13961

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13961)
+++ ChangeLog	(revision 13962)
@@ -1,3 +1,8 @@
+Mon Nov 19 01:53:11 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* parse.y (parser_read_escape): disallow control and meta modifiers
+	  for non-ASCII characters.  [ruby-core:13685]
+
 Sun Nov 18 20:47:41 2007  Tanaka Akira  <akr@f...>
 
 	* marshal.c (mark_dump_arg): it may be called after dump_ensure.
Index: parse.y
===================================================================
--- parse.y	(revision 13961)
+++ parse.y	(revision 13962)
@@ -5140,7 +5140,7 @@
 	    *has8bit = 1;
 	    return read_escape(flags|ESCAPE_META, &tmp, &tmp, encp) | 0x80;
 	}
-	else if (c == -1) goto eof;
+	else if (c == -1 || !ISASCII(c)) goto eof;
 	else {
             *has8bit = 1;
 	    return ((c & 0xff) | 0x80);
@@ -5159,7 +5159,7 @@
 	}
 	else if (c == '?')
 	    return 0177;
-	else if (c == -1) goto eof;
+	else if (c == -1 || !ISASCII(c)) goto eof;
 	return c & 0x9f;
 
       eof:
Index: version.h
===================================================================
--- version.h	(revision 13961)
+++ version.h	(revision 13962)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-11-18"
+#define RUBY_RELEASE_DATE "2007-11-19"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071118
+#define RUBY_RELEASE_CODE 20071119
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml