1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d06c00c651..a36b9313a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 25 18:30:53 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (fetch_token_in_cc): raise error if given octal escaped
+	  character is too big. [Bug #12420] [Bug #12423]
+
 Wed May 25 17:45:15 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
 	* ext/openssl, test/openssl: Drop OpenSSL < 0.9.8 support.