diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-19 14:28:26 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-19 14:28:26 +0000 |
| commit | b9a178e56c8ba06f70533fc81dc4081375cb8f9f (patch) | |
| tree | bb094d9d88928977f3dc44be4972d986fc417aaf /ext/socket | |
| parent | 88675fc9a92122f7770a9732a4cb64d62863cb1f (diff) | |
* ext/socket/option.c (inspect_tcp_info): Permit longer data. (glibc
2.7 adds tcpi_rcv_rtt, tcpi_rcv_space and tcpi_total_retrans to
struct tcp_info.)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/option.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/socket/option.c b/ext/socket/option.c index 7b63058159..e98492fec3 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -920,7 +920,8 @@ inspect_tcpi_msec(VALUE ret, const char *prefix, u_int32_t t) static int inspect_tcp_info(int level, int optname, VALUE data, VALUE ret) { - if (RSTRING_LEN(data) == sizeof(struct tcp_info)) { + size_t actual_size = RSTRING_LEN(data); + if (sizeof(struct tcp_info) <= actual_size) { struct tcp_info s; memcpy((char*)&s, RSTRING_PTR(data), sizeof(s)); #ifdef HAVE_STRUCT_TCP_INFO_TCPI_STATE @@ -1063,6 +1064,8 @@ inspect_tcp_info(int level, int optname, VALUE data, VALUE ret) #ifdef HAVE_STRUCT_TCP_INFO_TCPI_SND_ZEROWIN rb_str_catf(ret, " snd_zerowin=%u", s.tcpi_snd_zerowin); /* FreeBSD */ #endif + if (sizeof(struct tcp_info) < actual_size) + rb_str_catf(ret, " (%u bytes too long)", (unsigned)(actual_size - sizeof(struct tcp_info))); return 1; } else { |