archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

* regparse.c (parse_char_class): also need to check the type of token

Browse source 
after raw hyphen in regexp class, because the charcter code area
  is union'ed with the property of TK_CHAR_TYPE.
  reported by Bushi Zhang at [ruby-core:47115] [Backport #6853].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-10-12 16:47:05 +00:00
parent cc251c2f9f
commit 88e264d23d
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sat Oct 13 01:41:38 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* regparse.c (parse_char_class): also need to check the type of token
after raw hyphen in regexp class, because the charcter code area
is union'ed with the property of TK_CHAR_TYPE.
reported by Bushi Zhang at [ruby-core:47115] [Backport #6853].
Sat Oct 13 01:39:46 2012 NAKAMURA Usaku <usa@ruby-lang.org> Sat Oct 13 01:39:46 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_regexp.rb * test/ruby/test_regexp.rb

3
regparse.c
View file

@ -4491,6 +4491,9 @@ parse_char_class(Node** np, OnigToken* tok, UChar** src, UChar* end,
if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_ALLOW_DOUBLE_RANGE_OP_IN_CC)) { if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_ALLOW_DOUBLE_RANGE_OP_IN_CC)) {
CC_ESC_WARN(env, (UChar* )"-"); CC_ESC_WARN(env, (UChar* )"-");
if (tok->type == TK_CHAR_TYPE)
goto next_class; /* [0-9-\s] is allowed as [0-9\-\s] */
else
goto sb_char; /* [0-9-a] is allowed as [0-9\-a] */ goto sb_char; /* [0-9-a] is allowed as [0-9\-a] */
} }
r = ONIGERR_UNMATCHED_RANGE_SPECIFIER_IN_CHAR_CLASS; r = ONIGERR_UNMATCHED_RANGE_SPECIFIER_IN_CHAR_CLASS;

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 287 #define RUBY_PATCHLEVEL 288
#define RUBY_RELEASE_DATE "2012-10-13" #define RUBY_RELEASE_DATE "2012-10-13"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012