diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-14 15:17:49 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-14 15:17:49 +0000 |
| commit | 792cfa3fd0251f3b9fd8993a16b5948bd852e6da (patch) | |
| tree | 3887edc4cae285aee5051e0055319215606a1063 /ext/socket/getnameinfo.c | |
| parent | 93c819aa716c96f4963155af7ca9bc02e93f087f (diff) | |
* ext/socket/sockport.h (VALIDATE_SOCKLEN): new macro to validate
sa_len member of 4.4BSD socket address.
* ext/socket/getnameinfo.c (getnameinfo): use VALIDATE_SOCKLEN,
instead of SA_LEN.
* ext/socket/socket.c (sock_s_getnameinfo): use VALIDATE_SOCKLEN
instead of SS_LEN.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39242 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/getnameinfo.c')
| -rw-r--r-- | ext/socket/getnameinfo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c index d1d5ff6c73..d0c17e1826 100644 --- a/ext/socket/getnameinfo.c +++ b/ext/socket/getnameinfo.c @@ -151,8 +151,8 @@ getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, socklen_t ho if (sa == NULL) return ENI_NOSOCKET; - len = SA_LEN(sa); - if (len != salen) return ENI_SALEN; + if (!VALIDATE_SOCKLEN(sa, salen)) return ENI_SALEN; + len = salen; family = sa->sa_family; for (i = 0; afdl[i].a_af; i++) |