From 2aa3817e52492ed4e121a16eb57305acdacfda3a Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 11 Jun 2016 17:47:43 +0000
Subject: 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_3@55384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 84e93545d8..bf70701572 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 12 02:36:52 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (compile_length_tree): return error code immediately
+	  if compile_length_tree raised error [Bug #12418]
+
 Sun Jun 12 02:27:07 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* thread.c (recursive_list_access): a object id may be a Bignum.  so,
-- 
cgit v1.2.3