kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

unixsocket.c: abstract namespace

Browse source 
* ext/socket/unixsocket.c (unixsock_path_value): fix r62991 for
  Linux abstract namespace.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-03-28 11:30:27 +00:00
parent 1b91e1ce32
commit b78fa27ae0
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ext/socket/unixsocket.c
View file

@ -25,6 +25,28 @@ unixsock_connect_internal(VALUE a)
arg->sockaddrlen, 0); arg->sockaddrlen, 0);
} }
static VALUE
unixsock_path_value(VALUE path)
{
#ifdef __linux__
#define TO_STR_FOR_LINUX_ABSTRACT_NAMESPACE 0
VALUE name = path;
#if TO_STR_FOR_LINUX_ABSTRACT_NAMESPACE
const int isstr = !NIL_P(name = rb_check_string_type(name));
#else
const int isstr = RB_TYPE_P(name, T_STRING);
#endif
if (isstr) {
if (RSTRING_LEN(name) == 0 || RSTRING_PTR(name)[0] == '\0') {
rb_check_safe_obj(name);
return name; /* ignore encoding */
}
}
#endif
return rb_get_path(path);
}
VALUE VALUE
rsock_init_unixsock(VALUE sock, VALUE path, int server) rsock_init_unixsock(VALUE sock, VALUE path, int server)
{ {
@ -33,7 +55,7 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
int fd, status; int fd, status;
rb_io_t *fptr; rb_io_t *fptr;
FilePathValue(path); path = unixsock_path_value(path);
INIT_SOCKADDR_UN(&sockaddr, sizeof(struct sockaddr_un)); INIT_SOCKADDR_UN(&sockaddr, sizeof(struct sockaddr_un));
if (sizeof(sockaddr.sun_path) < (size_t)RSTRING_LEN(path)) { if (sizeof(sockaddr.sun_path) < (size_t)RSTRING_LEN(path)) {