diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-25 10:16:21 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-25 10:16:21 +0000 |
| commit | e86d271d9605bda1b19d534e108054e2902613da (patch) | |
| tree | 4c0cdb87f116d5f1d3043c3f37a8631f8928fbfe /ext | |
| parent | 784005805cd879ef3e51111f778e74741fb0ba0b (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_1@53931 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 28bdc07db6..90bbca553b 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -268,11 +268,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; } |