diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-09 13:45:33 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-09 13:45:33 +0000 |
| commit | 7d25771f17e2eb1db2067138ff27601ea6ab6986 (patch) | |
| tree | 614115a5604492822bb45aae485569b4ec796393 /ext/socket | |
| parent | 83d705f6a06eef70f9eb219ba7f187555f00ede8 (diff) | |
merge revision(s) 53561: [Backport #11958]
* 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/branches/ruby_2_2@54067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -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 b00ffb910c..7eb21c73a4 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -301,11 +301,16 @@ static VALUE sockopt_bool(VALUE self) { int i; + long len; VALUE data = sockopt_data(self); StringValue(data); - if (RSTRING_LEN(data) != sizeof(int)) + len = RSTRING_LEN(data); + if (len == 1) { + return *RSTRING_PTR(data) == 0 ? Qfalse : Qtrue; + } + if (len != sizeof(int)) rb_raise(rb_eTypeError, "size differ. expected as sizeof(int)=%d but %ld", - (int)sizeof(int), (long)RSTRING_LEN(data)); + (int)sizeof(int), (long)len); memcpy((char*)&i, RSTRING_PTR(data), sizeof(int)); return i == 0 ? Qfalse : Qtrue; } |