[jruby-joni] 270/279: Imported Upstream version 2.1.7

[Hideki Yamane]

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 9d7829d39a2f19d7b068db83cf9a3f0e87ca31d4
Author: Hideki Yamane <henrich at debian.org>
Date:   Tue Oct 20 06:57:31 2015 +0900

    Imported Upstream version 2.1.7
---
 pom.xml                           | 4 ++--
 src/org/joni/ByteCodeMachine.java | 4 ++--
 test/org/joni/test/TestU8.java    | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9ecfd33..32d435a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.jruby.joni</groupId>
   <artifactId>joni</artifactId>
   <packaging>jar</packaging>
-  <version>2.1.6</version>
+  <version>2.1.7</version>
   <name>Joni</name>
   <description>
     Java port of Oniguruma: http://www.geocities.jp/kosako3/oniguruma
@@ -66,7 +66,7 @@
     <dependency>
        <groupId>org.jruby.jcodings</groupId>
        <artifactId>jcodings</artifactId>
-       <version>1.0.12</version>
+       <version>1.0.13</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/src/org/joni/ByteCodeMachine.java b/src/org/joni/ByteCodeMachine.java
index a6a0cdd..1514d08 100644
--- a/src/org/joni/ByteCodeMachine.java
+++ b/src/org/joni/ByteCodeMachine.java
@@ -1060,7 +1060,7 @@ class ByteCodeMachine extends StackMachine {
         if (s == str) {
             if (s >= range || !enc.isMbcWord(bytes, s, end)) {opFail(); return;}
         } else if (s == end) {
-            if (!enc.isMbcWord(bytes, sprev, end)) {opFail(); return;}
+            if (s >= range || !enc.isMbcWord(bytes, sprev, end)) {opFail(); return;}
         } else {
             if (enc.isMbcWord(bytes, s, end) == enc.isMbcWord(bytes, sprev, end)) {opFail(); return;}
         }
@@ -1080,7 +1080,7 @@ class ByteCodeMachine extends StackMachine {
         if (s == str) {
             if (s < range && enc.isMbcWord(bytes, s, end)) {opFail(); return;}
         } else if (s == end) {
-            if (enc.isMbcWord(bytes, sprev, end)) {opFail(); return;}
+            if (sprev < end && enc.isMbcWord(bytes, sprev, end)) {opFail(); return;}
         } else {
             if (enc.isMbcWord(bytes, s, end) != enc.isMbcWord(bytes, sprev, end)) {opFail(); return;}
         }
diff --git a/test/org/joni/test/TestU8.java b/test/org/joni/test/TestU8.java
index 9723100..e2c261f 100644
--- a/test/org/joni/test/TestU8.java
+++ b/test/org/joni/test/TestU8.java
@@ -86,6 +86,9 @@ public class TestU8 extends Test {
         x2s("\\R", "\u2029", 0, 3);
 
         x2s("\\X", "\u306F\u309A\n", 0, 3);
+
+        ns("x.*\\b", "x");
+        x2s("x.*\\B", "x", 0, 1);
     }
 
     public static void main(String[] args) throws Throwable {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby-joni.git