StringValueCStr() raises an exception if passed a string which contai…

…ns null byte
anoiaque · Jul 3, 2012 · 507e4a9 · 507e4a9
1 parent 12b6f4a
commit 507e4a9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 16 deletions.
diff --git a/spec/frozen/tags/macruby/core/kernel/Integer_tags.txt b/spec/frozen/tags/macruby/core/kernel/Integer_tags.txt
diff --git a/spec/frozen/tags/macruby/core/kernel/exec_tags.txt b/spec/frozen/tags/macruby/core/kernel/exec_tags.txt
diff --git a/spec/frozen/tags/macruby/core/kernel/spawn_tags.txt b/spec/frozen/tags/macruby/core/kernel/spawn_tags.txt
diff --git a/spec/frozen/tags/macruby/core/process/exec_tags.txt b/spec/frozen/tags/macruby/core/process/exec_tags.txt
diff --git a/spec/frozen/tags/macruby/core/process/spawn_tags.txt b/spec/frozen/tags/macruby/core/process/spawn_tags.txt
diff --git a/string.c b/string.c
@@ -6579,13 +6579,20 @@ char *
 rb_string_value_cstr(volatile VALUE *ptr)
 {
     VALUE str = rb_string_value(ptr);
-    return (char *)rb_str_cstr(str);
+    const char *s = rb_str_cstr(str);
+    long len = RSTRING_LEN(str);
+
+    if (len != strlen(s)) {
+	rb_raise(rb_eArgError, "string contains null byte");
+    }
+    return (char *)s;
 }
 
 char *
 rb_string_value_ptr(volatile VALUE *ptr)
 {
-    return rb_string_value_cstr(ptr);
+    VALUE str = rb_string_value(ptr);
+    return (char*)rb_str_cstr(str);
 }
 
 VALUE