debian/changelog

+jruby-joni (2.1.26-1) unstable; urgency=medium
+
+  * New upstream release
+    - fix tests fail with invalid character property name
+      <graphemeclusterbreak=emodifier> (Closes: #923295)
+  * debian/control
+    - set Standards-Version: 4.3.0
+    - use dh12
+  * debian/compat
+    - drop it
+
+ -- Hideki Yamane <henrich@debian.org>  Thu, 07 Mar 2019 16:59:41 +0900
+
 jruby-joni (2.1.25-1) unstable; urgency=medium
 
   * New upstream release

debian/compat

-11

debian/control

@@ -6,14 +6,14 @@ Uploaders:
  Hideki Yamane <henrich@debian.org>,
  Torsten Werner <twerner@debian.org>
 Build-Depends:
- debhelper (>= 11),
+ debhelper (>= 12), debhelper-compat (= 12),
  default-jdk
 Build-Depends-Indep:
  junit4 (>= 4.12),
  libasm-java (>= 6.2.1),
  libjcodings-java (>= 1.0.41),
  maven-debian-helper (>= 2.0)
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/jruby-joni.git
 Vcs-Browser: https://salsa.debian.org/java-team/jruby-joni
 Homepage: https://github.com/jruby/joni/

pom.xml

@@ -4,7 +4,7 @@
   <groupId>org.jruby.joni</groupId>
   <artifactId>joni</artifactId>
   <packaging>jar</packaging>
-  <version>2.1.25</version>
+  <version>2.1.26</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.41</version>
+       <version>1.0.43</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

src/org/joni/ByteCodeMachine.java

@@ -1320,6 +1320,7 @@ class ByteCodeMachine extends StackMachine {
     private void opMemoryStart() {
         int mem = code[ip++];
         repeatStk[memStartStk + mem] = s;
+        repeatStk[memEndStk + mem] = -1;
     }
 
     private void opMemoryEndPush() {

src/org/joni/ast/StringNode.java

@@ -33,7 +33,7 @@ public final class StringNode extends Node implements StringType {
     public int end;
     public int flag;
 
-    private StringNode(int size) {
+    public StringNode(int size) {
         super(STR);
         this.bytes = new byte[size];
     }

test/org/joni/test/TestError.java

@@ -71,6 +71,7 @@ public class TestError extends Test {
 	    xerrs("a{5,1}", ErrorMessages.UPPER_SMALLER_THAN_LOWER_IN_REPEAT_RANGE);
 	    xerrs("[\\6000", ErrorMessages.TOO_BIG_NUMBER); // CVE-2017-9226
 	    xerrs("[\\H- ]", ErrorMessages.UNMATCHED_RANGE_SPECIFIER_IN_CHAR_CLASS); // CVE-2017-9228
+	    xerrs("[a-\\d]", ErrorMessages.CHAR_CLASS_VALUE_AT_END_OF_RANGE);
 
 	    xerrs("(?:ab|cd)*\\1", ErrorMessages.INVALID_BACKREF);
 	    xerrs("(ab|cd)*\\1", ErrorMessages.INVALID_BACKREF, Option.DONT_CAPTURE_GROUP);
@@ -85,6 +86,7 @@ public class TestError extends Test {
 	    xerrs("\\k<1/>", ErrorMessages.INVALID_GROUP_NAME.replace("%n", "1/"));
 	    // xerrs("\\k<1-1/>", ErrorMessages.ERR_INVALID_GROUP_NAME.replace("%n", "1-1/>"));
 	    // xerrs("\\k<a/>", ErrorMessages.ERR_INVALID_CHAR_IN_GROUP_NAME.replace("%n", "a/"));
+	    // xerrs("\\g<1>", ErrorMessages.UNDEFINED_GROUP_REFERENCE);
 
 	    xerrs("*", ErrorMessages.TARGET_OF_REPEAT_OPERATOR_NOT_SPECIFIED);
 	    xerrs("{1}", ErrorMessages.TARGET_OF_REPEAT_OPERATOR_NOT_SPECIFIED);
@@ -95,5 +97,7 @@ public class TestError extends Test {
 
 	    xerrs("()(?(2))", ErrorMessages.INVALID_BACKREF);
 	    xerrs("(?(700000))", ErrorMessages.INVALID_BACKREF);
+
+	    xerrs("(?<!a(?:bb|c))", ErrorMessages.INVALID_LOOK_BEHIND_PATTERN);
     }
 }

test/org/joni/test/TestU8.java

@@ -320,6 +320,7 @@ public class TestU8 extends Test {
         x2s("(?~abc|def)x", "abcx", 1, 4);
         x2s("(?~abc|def)x", "defx", 1, 4);
         x2s("^(?~\\S+)TEST", "TEST", 0, 4);
+        x3s("(?~(a)c)", "aab", -1, -1, 1); //    # $1 should not match.
 
         x2s("𠜎𠜱", "𠜎𠜱", 0, 8);
         x2s("𠜎?𠜱", "𠜎𠜱", 0, 8);
@@ -352,5 +353,7 @@ public class TestU8 extends Test {
 
         x2s("\\P{In_Supplemental_Symbols_and_Pictographs}?", "", 0, 0);
         x2s("\\P{In_Transport_and_Map_Symbols}?", "", 0, 0);
+
+        x2s("^(\"|)(.*)\\1$", "X6", 0, 2);
     }
 }