archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 39547: [Backport #7972] [Backport #7974]

Browse source 
* Merge Onigmo 0fe387da2fee089254f6b04990541c731a26757f
	  v5.13.3 [Bug#7972] [Bug#7974]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-03-26 17:59:06 +00:00
parent 5c2169d4c7
commit 0ce7a947d5
9 changed files with 81 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
regexec.c
View file

@ -2559,7 +2559,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
(int )mem, (intptr_t )s, s);
#endif
if (isnull == -1) goto fail;
goto null_check_found;
goto null_check_found;
}
}
MOP_OUT;
@ -2585,7 +2585,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
(int )mem, (intptr_t )s, s);
#endif
if (isnull == -1) goto fail;
goto null_check_found;
goto null_check_found;
}
else {
STACK_PUSH_NULL_CHECK_END(mem);