summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-10 07:11:45 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-10 07:11:45 +0000
commit21aef91673bb6b2a7f3025b3c79c5f097a262131 (patch)
tree92c9de90b75e8ecf9f32fd799b8c65f96e43873c /ChangeLog
parent0a619ef7efdaa8001bb4a9b028e2b35174ce66bb (diff)
merge revision(s) 55154: [Backport #12418]
* regcomp.c (compile_length_tree): return error code immediately if compile_length_tree raised error [Bug #12418] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 57775f6cfa..bada4cfe09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 10 16:10:23 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * regcomp.c (compile_length_tree): return error code immediately
+ if compile_length_tree raised error [Bug #12418]
+
Fri Jun 10 16:06:25 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/missing.h (isfinite): move from numeric.c.