pom.xml

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

test/org/joni/test/TestU8.java

@@ -349,5 +349,10 @@ public class TestU8 extends Test {
 
         ns("💌", "aa");
         ns("aa", "💌");
+
+        x2s("\\P{In_Supplemental_Symbols_and_Pictographs}?", "", 0, 0);
+        x2s("\\P{In_Transport_and_Map_Symbols}?", "", 0, 0);
+
+        x2s("^(\"|)(.*)\\1$", "X6", 0, 2);
     }
 }