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

init.c: encode socket error message

Browse source 
* ext/socket/init.c (rsock_raise_socket_error): on Windows, encode
  error messages from wide characters to the default encodings.
  [ruby-core:84972] [Bug #14384]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-01-23 15:31:22 +00:00
parent d6aa4916b8
commit a41005eb6a
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/socket/init.c
View file

@ -10,6 +10,10 @@
#include "rubysocket.h" #include "rubysocket.h"
#ifdef _WIN32
VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
#endif
VALUE rb_cBasicSocket; VALUE rb_cBasicSocket;
VALUE rb_cIPSocket; VALUE rb_cIPSocket;
VALUE rb_cTCPSocket; VALUE rb_cTCPSocket;
@ -39,7 +43,15 @@ rsock_raise_socket_error(const char *reason, int error)
if (error == EAI_SYSTEM && (e = errno) != 0) if (error == EAI_SYSTEM && (e = errno) != 0)
rb_syserr_fail(e, reason); rb_syserr_fail(e, reason);
#endif #endif
#ifdef _WIN32
rb_encoding *enc = rb_default_internal_encoding();
VALUE msg = rb_sprintf("%s: ", reason);
if (!enc) enc = rb_default_internal_encoding();
rb_str_concat(msg, rb_w32_conv_from_wchar(gai_strerrorW(error), enc));
rb_exc_raise(rb_exc_new_str(rb_eSocket, msg));
#else
rb_raise(rb_eSocket, "%s: %s", reason, gai_strerror(error)); rb_raise(rb_eSocket, "%s: %s", reason, gai_strerror(error));
#endif
} }
#ifdef _WIN32 #ifdef _WIN32

8
test/socket/test_addrinfo.rb
View file

@ -102,6 +102,14 @@ class TestSocketAddrinfo < Test::Unit::TestCase
assert(!ipv4_ai.unix?) assert(!ipv4_ai.unix?)
end end
def test_error_message
e = assert_raise_with_message(SocketError, /getaddrinfo:/) do
Addrinfo.ip("...")
end
m = e.message
assert_not_equal([false, Encoding::ASCII_8BIT], [m.ascii_only?, m.encoding], proc {m.inspect})
end
def test_ipv4_address_predicates def test_ipv4_address_predicates
list = [ list = [
[:ipv4_private?, "10.0.0.0", "10.255.255.255", [:ipv4_private?, "10.0.0.0", "10.255.255.255",