* parse.y (read_escape): deny zero-width hexadecimal character.

  (ruby-bugs-ja:PR#260)

* parse.y (tokadd_escape): ditto.

* regex.c (re_compile_pattern): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 0 deletions

diff --git a/parse.y b/parse.y
index a200f0b14e..e4f4627dc9 100644
--- a/parse.y
+++ b/parse.y
@@ -2416,6 +2416,10 @@ read_escape()
 	    int numlen;
 
 	    c = scan_hex(lex_p, 2, &numlen);
+	    if (numlen == 0) {
+		yyerror("Invalid escape character syntax");
+		return 0;
+	    }
 	    lex_p += numlen;
 	}
 	return c;
@@ -2501,6 +2505,10 @@ tokadd_escape(term)
 	    tokadd('\\');
 	    tokadd(c);
 	    scan_hex(lex_p, 2, &numlen);
+	    if (numlen == 0) {
+		yyerror("Invalid escape character syntax");
+		return -1;
+	    }
 	    while (numlen--)
 		tokadd(nextc());
 	}