diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-06 02:50:08 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-06 02:50:08 +0000 |
commit | 11a9d772860d8123d9284ab11535fe6398742576 (patch) | |
tree | 24fce312bb47636bbe940b20d454e1982eea3a76 | |
parent | d933fb2296e4ace25c5eb558be56cd23a8fcc88f (diff) |
* ext/socket/socket.c (rsock_sys_fail_path): Use rb_str_inspect if the
path contains a NUL.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/socket/socket.c | 13 |
2 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sat Apr 6 11:49:35 2013 Tanaka Akira <akr@fsij.org> + + * ext/socket/socket.c (rsock_sys_fail_path): Use rb_str_inspect if the + path contains a NUL. + Sat Apr 6 11:39:19 2013 Tanaka Akira <akr@fsij.org> * ext/socket: Improve socket exception message to show socket address. diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 10412be719..be7bd62236 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -28,9 +28,16 @@ rsock_sys_fail_host_port(const char *mesg, VALUE host, VALUE port) void rsock_sys_fail_path(const char *mesg, VALUE path) { - VALUE message = rb_sprintf("%s for \"%s\"", - mesg, StringValueCStr(path)); - + VALUE message; + if (memchr(RSTRING_PTR(path), '\0', RSTRING_LEN(path))) { + path = rb_str_inspect(path); + message = rb_sprintf("%s for %s", mesg, + StringValueCStr(path)); + } + else { + message = rb_sprintf("%s for \"%s\"", mesg, + StringValueCStr(path)); + } rb_sys_fail_str(message); } |