New upstream version 6.1.1upstream/6.1.1

9 files changed, 16 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14e22fd..5523a5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8)
 project(oniguruma C)
 
 set(PACKAGE onig)
-set(PACKAGE_VERSION "6.1.0")
+set(PACKAGE_VERSION "6.1.1")
 
 set(USE_COMBINATION_EXPLOSION_CHECK 0)
 set(USE_CRNL_AS_LINE_TERMINATOR 0)
diff --git a/HISTORY b/HISTORY
index 0e9b1c7..9894c7d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,10 @@
 History
 
+2016/09/02: Version 6.1.1
+
+2016/08/31: fix segfault /W.?{888}{888}{888}\x00/ (found by libfuzzer)
+2016/08/31: fix error unmatched close parenthesis for %{(.*?)} #23
+
 2016/08/29: Version 6.1.0
 
 2016/08/28: add contributed/libfuzzer-onig.cpp  (thanks hannob)
diff --git a/configure.ac b/configure.ac
index 6bd3d73..e7d8459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(onig, 6.1.0)
+AC_INIT(onig, 6.1.1)
 
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/dist.info b/dist.info
index a7633b8..6ecfe65 100644
--- a/dist.info
+++ b/dist.info
@@ -1,7 +1,7 @@
 --- This file is part of LuaDist project
 
 name = "onig"
-version = "6.1.0"
+version = "6.1.1"
 
 desc = "Oniguruma is a regular expressions library."
 author = "K.Kosako"
diff --git a/index.html b/index.html
index e7c263e..159d687 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
 <h1>Oniguruma</h1> (<a href="index_ja.html">Japanese</a>)
 
 <p>
-(c) K.Kosako, updated at: 2016/08/22
+(c) K.Kosako, updated at: 2016/08/31
 </p>
 
 <dl>
@@ -16,6 +16,7 @@
 <dt><b>What's new</b>
 </font>
 <ul>
+<li>2016/09/02: Version 6.1.1 released.</li>
 <li>2016/08/29: Version 6.1.0 released.</li>
 <li>2016/05/09: Version 6.0.0 released.</li>
 <li>2014/12/12: Version 5.9.6 released.</li>
diff --git a/index_ja.html b/index_ja.html
index 9c68c85..0918897 100644
--- a/index_ja.html
+++ b/index_ja.html
@@ -8,7 +8,7 @@
 <h1>鬼車</h1>
 
 <p>
-(c) K.Kosako, 最終更新: 2016/08/22
+(c) K.Kosako, 最終更新: 2016/08/31
 </p>
 
 <dl>
@@ -16,6 +16,7 @@
 <dt><b>更新情報</b>
 </font>
 <ul>
+<li>2016/09/02: Version 6.1.1 リリース</li>
 <li>2016/08/29: Version 6.1.0 リリース</li>
 <li>2016/05/09: Version 6.0.0 リリース</li>
 <li>2014/12/12: Version 5.9.6 リリース</li>
diff --git a/src/oniguruma.h b/src/oniguruma.h
index 75301ca..5aa49f6 100644
--- a/src/oniguruma.h
+++ b/src/oniguruma.h
@@ -36,7 +36,7 @@ extern "C" {
 #define ONIGURUMA
 #define ONIGURUMA_VERSION_MAJOR   6
 #define ONIGURUMA_VERSION_MINOR   1
-#define ONIGURUMA_VERSION_TEENY   0
+#define ONIGURUMA_VERSION_TEENY   1
 
 #ifdef __cplusplus
 # ifndef  HAVE_PROTOTYPES
diff --git a/src/regcomp.c b/src/regcomp.c
index 5c0f21f..0235a9f 100644
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -4031,12 +4031,12 @@ distance_value(MinMaxLen* mm)
       11,   11,   11,   11,   11,   10,   10,   10,   10,   10
   };
 
-  int d;
+  OnigLen d;
 
   if (mm->max == ONIG_INFINITE_DISTANCE) return 0;
 
   d = mm->max - mm->min;
-  if (d < (int )(sizeof(dist_vals)/sizeof(dist_vals[0])))
+  if (d < (OnigLen )(sizeof(dist_vals)/sizeof(dist_vals[0])))
     /* return dist_vals[d] * 16 / (mm->min + 12); */
     return (int )dist_vals[d];
   else
diff --git a/src/regparse.c b/src/regparse.c
index 6be8366..e8a6e20 100644
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -2302,7 +2302,7 @@ fetch_range_quantifier(UChar** src, UChar* end, OnigToken* tok, ScanEnv* env)
 
  invalid:
   if (syn_allow) {
-    *src = p;
+    /* *src = p; */ /* !!! Don't do this line !!! */
     return 1;  /* OK */
   }
   else