diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-17 06:31:36 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-17 06:31:36 +0000 |
commit | 6308dd132e9ad5df50ae24641f70db2aad797183 (patch) | |
tree | 83ed1268fc7353ad3d787e0068a6f6be935522f7 /ext | |
parent | ac9a9e9131e25f71bbb9a2c0ec019bb409e8d941 (diff) | |
download | ruby-6308dd132e9ad5df50ae24641f70db2aad797183.tar.gz |
option.c: single byte boolean
* ext/socket/option.c (sockopt_bool): relax boolean size to be one
too not only sizeof(int). Winsock getsockopt() returns a single
byte as a boolean socket option. [ruby-core:72730] [Bug #11958]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/socket/option.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/socket/option.c b/ext/socket/option.c index d2da072ad7..9fe21a12c1 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -302,10 +302,15 @@ static VALUE sockopt_bool(VALUE self) { int i; + long len; VALUE data = sockopt_data(self); StringValue(data); - check_size(RSTRING_LEN(data), sizeof(int)); - memcpy((char*)&i, RSTRING_PTR(data), sizeof(int)); + len = RSTRING_LEN(data); + if (len == 1) { + return *RSTRING_PTR(data) == 0 ? Qfalse : Qtrue; + } + check_size(len, sizeof(int)); + memcpy((char*)&i, RSTRING_PTR(data), len); return i == 0 ? Qfalse : Qtrue; } |