aboutsummaryrefslogtreecommitdiffstats
path: root/re.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-25 11:51:37 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-25 11:51:37 +0000
commit6bd4a506055c207525d197a97fe49fb54d4dafee (patch)
treeac5c2d3d8e752b9e9849ba0147ad8d991fc5c945 /re.c
parentaf6c761b18324a61ef309bfce7efd25ff1a0c74d (diff)
downloadruby-6bd4a506055c207525d197a97fe49fb54d4dafee.tar.gz
* re.c (unescape_nonascii): scan hex up to only 3 characters.
[Bug #12420] [Bug #12423] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r--re.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/re.c b/re.c
index 2eb42bc470..84f22b0bc6 100644
--- a/re.c
+++ b/re.c
@@ -2492,8 +2492,8 @@ unescape_nonascii(const char *p, const char *end, rb_encoding *enc,
case '1': case '2': case '3':
case '4': case '5': case '6': case '7': /* \O, \OO, \OOO or backref */
{
- size_t octlen;
- if (ruby_scan_oct(p-1, end-(p-1), &octlen) <= 0177) {
+ size_t len = end-(p-1), octlen;
+ if (ruby_scan_oct(p-1, len < 3 ? len : 3, &octlen) <= 0177) {
/* backref or 7bit octal.
no need to unescape anyway.
re-escaping may break backref */