debian/changelog

+jruby-joni (2.1.25-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/control
+    - Adjust Build-Dependency version
+
+ -- Hideki Yamane <henrich@debian.org>  Sat, 20 Oct 2018 07:46:51 +0900
+
 jruby-joni (2.1.24-1) unstable; urgency=medium
 
   * New upstream release

debian/control

@@ -11,7 +11,7 @@ Build-Depends:
 Build-Depends-Indep:
  junit4 (>= 4.12),
  libasm-java (>= 6.2.1),
- libjcodings-java (>= 1.0.40),
+ libjcodings-java (>= 1.0.41),
  maven-debian-helper (>= 2.0)
 Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/jruby-joni.git

pom.xml

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

src/org/joni/ByteCodeMachine.java

@@ -1273,7 +1273,7 @@ class ByteCodeMachine extends StackMachine {
     private void opEndLineSb()  {
         if (s == end) {
             if (Config.USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE) {
-                if (str == end || bytes[sprev] != Encoding.NEW_LINE) {
+                if (str == end || !(sprev < end && bytes[sprev] == Encoding.NEW_LINE)) {
                     if (isNotEol(msaOptions)) opFail();
                 }
                 return;

src/org/joni/Lexer.java

@@ -422,8 +422,6 @@ class Lexer extends ScannerSupport {
     private final int fetchNameForNoNamedGroup(int startCode, boolean ref) {
         int src = p;
         value = 0;
-
-        int isNum = 0;
         int sign = 1;
 
         int endCode = nameEndCodePoint(startCode);
@@ -438,9 +436,7 @@ class Lexer extends ScannerSupport {
             if (c == endCode) newValueException(EMPTY_GROUP_NAME);
 
             if (enc.isDigit(c)) {
-                isNum = 1;
             } else if (c == '-') {
-                isNum = 2;
                 sign = -1;
                 pnumHead = p;
             } else {

test/org/joni/test/TestError.java

@@ -93,5 +93,7 @@ public class TestError extends Test {
 
 	    xerrs("(a)?(?<n>b)?(?(1)a)(?(<n>)b)", ErrorMessages.NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED);
 
+	    xerrs("()(?(2))", ErrorMessages.INVALID_BACKREF);
+	    xerrs("(?(700000))", ErrorMessages.INVALID_BACKREF);
     }
 }

test/org/joni/test/TestU8.java

@@ -348,5 +348,9 @@ public class TestU8 extends Test {
         ns("^.+$", "\n");
 
         ns("💌", "aa");
+        ns("aa", "💌");
+
+        x2s("\\P{In_Supplemental_Symbols_and_Pictographs}?", "", 0, 0);
+        x2s("\\P{In_Transport_and_Map_Symbols}?", "", 0, 0);
     }
 }