Fix strlen.

oracle · Mar 20, 2017 · cea9205 · cea9205
1 parent 578dc1f
commit cea9205
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/spec/tags/optional/capi/string_tags.txt b/spec/tags/optional/capi/string_tags.txt
@@ -1,8 +1,6 @@
 fails:C-API String function rb_str_buf_new returns a string whose bytes can be accessed by RSTRING_PTR
 fails:C-API String function rb_str_buf_new returns a string that can be modified by rb_str_set_len
-fails:C-API String function rb_str_new2 returns a new string object calling strlen on the passed C string
 fails:C-API String function rb_str_new2 encodes the string with ASCII_8BIT
-fails:C-API String function rb_str_new_cstr returns a new string object calling strlen on the passed C string
 fails:C-API String function rb_str_new_cstr encodes the string with ASCII_8BIT
 fails:C-API String function rb_str_subseq returns a byte-indexed substring
 fails:C-API String function StringValue does not call #to_s on non-String objects

diff --git a/truffleruby/src/main/c/cext/ruby.c b/truffleruby/src/main/c/cext/ruby.c
@@ -876,7 +876,9 @@ VALUE rb_str_new(const char *string, long length) {
 
 VALUE rb_str_new_cstr(const char *string) {
   if (truffle_is_truffle_object((VALUE) string)) {
-    return (VALUE) truffle_invoke(RUBY_CEXT, "to_ruby_string", string);
+    VALUE ruby_string = (VALUE) truffle_invoke(RUBY_CEXT, "to_ruby_string", string);
+    int len = strlen(string);
+    return (VALUE) truffle_invoke(ruby_string, "[]", 0, len);
   } else {
     return (VALUE) truffle_invoke(RUBY_CEXT, "rb_str_new_cstr", truffle_read_string(string));
   }

diff --git a/truffleruby/src/main/java/org/truffleruby/cext/StringCharPointerMessageResolution.java b/truffleruby/src/main/java/org/truffleruby/cext/StringCharPointerMessageResolution.java
@@ -59,7 +59,14 @@ protected Object access(StringCharPointerAdapter object) {
     public static abstract class CharPointerGetSizeNode extends Node {
 
         protected Object access(StringCharPointerAdapter stringCharPointerAdapter) {
-            return rope(stringCharPointerAdapter.getString()).byteLength();
+            byte[] bytes = rope(stringCharPointerAdapter.getString()).getBytes();
+            int i = 0;
+            for (;i < bytes.length; i++) {
+                if (bytes[i] == 0) {
+                    break;
+                }
+            }
+            return i;
         }
 
     }