From 4abcda3c3b7d9cb44036840ec0af01d5294dedc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Fri, 2 Sep 2016 21:24:33 +0200
Subject: New upstream version 6.1.1

---
 src/oniguruma.h | 2 +-
 src/regcomp.c   | 4 ++--
 src/regparse.c  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3