diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-20 17:17:52 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-20 17:17:52 +0000 |
commit | e4de8e756634e95ff3cdbd7563153bc8270fca2e (patch) | |
tree | 5c3201101689d42be50fa18dae58fa326cf296f3 /string.c | |
parent | 6a867d33b5aa4ed67800cd64fe19d2902250bd96 (diff) |
* string.c: use StringValueCStr to retrieve paths to system calls.
* string.c (rb_string_value_cstr): check null byte in the string
before retrieving C ptr. accessed via macro StringValueCStr.
* file.c (sys_fail2): raise error for two operand system calls
such as rename, link, symlink. (ruby-bugs PR#1047)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -473,6 +473,19 @@ rb_string_value_ptr(ptr) return RSTRING(rb_string_value(ptr))->ptr; } +char * +rb_string_value_cstr(ptr) + volatile VALUE *ptr; +{ + VALUE str = rb_string_value(ptr); + char *s = RSTRING(str)->ptr; + + if (!s || RSTRING(str)->len != strlen(s)) { + rb_raise(rb_eArgError, "string contains null byte"); + } + return s; +} + VALUE rb_check_string_type(str) VALUE str; |