String#crypt needs a raw byte[] version from jnr-posix 3.0.11.

jruby · Mar 24, 2015 · e9ed3c0 · e9ed3c0
1 parent 8aa9c0f
commit e9ed3c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-posix</artifactId>
-      <version>3.0.10</version>
+      <version>3.0.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>

diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -2240,18 +2240,20 @@ public RubyString crypt(ThreadContext context, IRubyObject other) {
         RubyString otherStr = other.convertToString().strDup(context.runtime);
         otherStr.modify();
         otherStr.associateEncoding(ascii8bit);
-        String salt = otherStr.asJavaString();
-        if (otherStr.getByteList().length() < 2) {
+        ByteList otherBL = otherStr.getByteList();
+        if (otherBL.length() < 2) {
             throw context.runtime.newArgumentError("salt too short(need >=2 bytes)");
         }
 
         POSIX posix = context.runtime.getPosix();
-        CharSequence cryptedString = posix.crypt(asJavaString(), salt);
+        byte[] keyBytes = Arrays.copyOfRange(value.unsafeBytes(), value.begin(), value.realSize());
+        byte[] saltBytes = Arrays.copyOfRange(otherBL.unsafeBytes(), otherBL.begin(), otherBL.realSize());
+        byte[] cryptedString = posix.crypt(keyBytes, saltBytes);
         // We differ from MRI in that we do not process salt to make it work and we will
         // return any errors via errno.
         if (cryptedString == null) throw context.runtime.newErrnoFromInt(posix.errno());
 
-        RubyString result = RubyString.newString(context.runtime, cryptedString.toString());
+        RubyString result = RubyString.newStringNoCopy(context.runtime, cryptedString, 0, cryptedString.length - 1);
         result.associateEncoding(ascii8bit);
         result.infectBy(this);
         result.infectBy(otherStr);