diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-21 10:53:06 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-21 10:53:06 +0000 |
| commit | b2cc0976a7e167f47d3f71fb637af699950f15f9 (patch) | |
| tree | 82ec93041977a89596469e2b081256e86138a34c | |
| parent | 51f41bb843845dee4b9ada16a8100a3f558d70cd (diff) | |
| download | ruby-b2cc0976a7e167f47d3f71fb637af699950f15f9.tar.gz | |
* regcomp.c: Merge Onigmo 3d855b30d574536d3ae600260208c6624ae4791c.
[Bug#6143] [Bug#6144] [Bug#6145]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | regerror.c | 2 | ||||
| -rw-r--r-- | regexec.c | 6 | ||||
| -rw-r--r-- | regparse.c | 6 |
4 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Wed Mar 21 17:57:57 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * regcomp.c: Merge Onigmo 3d855b30d574536d3ae600260208c6624ae4791c. + [Bug#6143] [Bug#6144] [Bug#6145] + Wed Mar 21 17:01:55 2012 NAKAMURA Usaku <usa@ruby-lang.org> * test/ruby/test_io.rb (TestIO#test_pos_with_getc): added. diff --git a/regerror.c b/regerror.c index 2bf1d320d3..9c94d23018 100644 --- a/regerror.c +++ b/regerror.c @@ -116,7 +116,7 @@ onig_error_code_to_format(OnigPosition code) case ONIGERR_INVALID_REPEAT_RANGE_PATTERN: p = "invalid repeat range {lower,upper}"; break; case ONIGERR_INVALID_CONDITION_PATTERN: - p = "invalid condition pattern"; break; + p = "invalid conditional pattern"; break; case ONIGERR_TOO_BIG_NUMBER: p = "too big number"; break; case ONIGERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE: @@ -446,16 +446,16 @@ onig_region_copy(OnigRegion* to, OnigRegion* from) #define STACK_INIT(alloc_addr, ptr_num, stack_num) do {\ if (msa->stack_p) {\ - alloc_addr = (char* )xalloca(sizeof(char*) * (ptr_num));\ + alloc_addr = (char* )xalloca(sizeof(OnigStackIndex) * (ptr_num));\ stk_alloc = (OnigStackType* )(msa->stack_p);\ stk_base = stk_alloc;\ stk = stk_base;\ stk_end = stk_base + msa->stack_n;\ }\ else {\ - alloc_addr = (char* )xalloca(sizeof(char*) * (ptr_num)\ + alloc_addr = (char* )xalloca(sizeof(OnigStackIndex) * (ptr_num)\ + sizeof(OnigStackType) * (stack_num));\ - stk_alloc = (OnigStackType* )(alloc_addr + sizeof(char*) * (ptr_num));\ + stk_alloc = (OnigStackType* )(alloc_addr + sizeof(OnigStackIndex) * (ptr_num));\ stk_base = stk_alloc;\ stk = stk_base;\ stk_end = stk_base + (stack_num);\ diff --git a/regparse.c b/regparse.c index f82db81960..39de2359f8 100644 --- a/regparse.c +++ b/regparse.c @@ -5015,6 +5015,8 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end, num = backs[0]; /* XXX: use left most named group as Perl */ } #endif + else + return ONIGERR_INVALID_CONDITION_PATTERN; *np = node_new_enclose(ENCLOSE_CONDITION); CHECK_NULL_RETURN_MEMERR(*np); NENCLOSE(*np)->regnum = num; @@ -5975,7 +5977,8 @@ parse_exp(Node** np, OnigToken* tok, int term, *np = node_new_cclass(); CHECK_NULL_RETURN_MEMERR(*np); cc = NCCLASS(*np); - add_ctype_to_cc(cc, tok->u.prop.ctype, 0, 0, env); + r = add_ctype_to_cc(cc, tok->u.prop.ctype, 0, 0, env); + if (r != 0) return r; if (tok->u.prop.not != 0) NCCLASS_SET_NOT(cc); #ifdef USE_SHARED_CCLASS_TABLE } @@ -6005,6 +6008,7 @@ parse_exp(Node** np, OnigToken* tok, int term, cc = NCCLASS(*np); if (is_onechar_cclass(cc, &code)) { + onig_node_free(*np); *np = node_new_empty(); CHECK_NULL_RETURN_MEMERR(*np); r = node_str_cat_codepoint(*np, env->enc, code); |