diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-05-08 08:44:22 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-05-08 08:44:22 -0500 |
| commit | d96f755682c16141962d0fc7914cd46263f8a961 (patch) | |
| tree | cd93d1aa5b249eaf6bca0eafaf1922dbd58308ec /main | |
| parent | 552e6d81efa7871f9f155b39ae8a842b423ad3e9 (diff) | |
| parent | 924628812b68e01cf7506b44b292e6057716f77a (diff) | |
Merge "netsock2.c: Made get/set addr port avoid potential uninitialized memory."
Diffstat (limited to 'main')
| -rw-r--r-- | main/netsock2.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/main/netsock2.c b/main/netsock2.c index bfa181c86..8fb9c9e56 100644 --- a/main/netsock2.c +++ b/main/netsock2.c @@ -431,11 +431,16 @@ int ast_sockaddr_cmp_addr(const struct ast_sockaddr *a, const struct ast_sockadd uint16_t _ast_sockaddr_port(const struct ast_sockaddr *addr, const char *file, int line, const char *func) { - if (addr->ss.ss_family == AF_INET && - addr->len == sizeof(struct sockaddr_in)) { + /* + * Test addr->len first to be tolerant of an ast_sockaddr_setnull() + * addr. In that case addr->len might be the only value initialized. + */ + if (addr->len == sizeof(struct sockaddr_in) + && addr->ss.ss_family == AF_INET) { return ntohs(((struct sockaddr_in *)&addr->ss)->sin_port); - } else if (addr->ss.ss_family == AF_INET6 && - addr->len == sizeof(struct sockaddr_in6)) { + } + if (addr->len == sizeof(struct sockaddr_in6) + && addr->ss.ss_family == AF_INET6) { return ntohs(((struct sockaddr_in6 *)&addr->ss)->sin6_port); } if (option_debug >= 1) { @@ -446,11 +451,15 @@ uint16_t _ast_sockaddr_port(const struct ast_sockaddr *addr, const char *file, i void _ast_sockaddr_set_port(struct ast_sockaddr *addr, uint16_t port, const char *file, int line, const char *func) { - if (addr->ss.ss_family == AF_INET && - addr->len == sizeof(struct sockaddr_in)) { + /* + * Test addr->len first to be tolerant of an ast_sockaddr_setnull() + * addr. In that case addr->len might be the only value initialized. + */ + if (addr->len == sizeof(struct sockaddr_in) + && addr->ss.ss_family == AF_INET) { ((struct sockaddr_in *)&addr->ss)->sin_port = htons(port); - } else if (addr->ss.ss_family == AF_INET6 && - addr->len == sizeof(struct sockaddr_in6)) { + } else if (addr->len == sizeof(struct sockaddr_in6) + && addr->ss.ss_family == AF_INET6) { ((struct sockaddr_in6 *)&addr->ss)->sin6_port = htons(port); } else if (option_debug >= 1) { ast_log(__LOG_DEBUG, file, line, func, |