kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-10 23:07:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "netsock2.c: Made get/set addr port avoid potential uninitialized memory." into 13

Browse Source
This commit is contained in:
Joshua Colp
2017-05-08 08:46:57 -05:00
committed by Gerrit Code Review
parent 4d0bc3e5fc 614eda785d
commit e3fa458440
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
main/netsock2.c
View File

@@ -433,11 +433,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) 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); 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); return ntohs(((struct sockaddr_in6 *)&addr->ss)->sin6_port);
} }
if (option_debug >= 1) { if (option_debug >= 1) {
@@ -448,11 +453,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) 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); ((struct sockaddr_in *)&addr->ss)->sin_port = htons(port);
} else if (addr->ss.ss_family == AF_INET6 && } else if (addr->len == sizeof(struct sockaddr_in6)
addr->len == sizeof(struct sockaddr_in6)) { && addr->ss.ss_family == AF_INET6) {
((struct sockaddr_in6 *)&addr->ss)->sin6_port = htons(port); ((struct sockaddr_in6 *)&addr->ss)->sin6_port = htons(port);
} else if (option_debug >= 1) { } else if (option_debug >= 1) {
ast_log(__LOG_DEBUG, file, line, func, ast_log(__LOG_DEBUG, file, line, func,