diff options
| author | Stefan Fritsch <sf@apache.org> | 2013-01-26 20:41:53 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2013-01-26 20:41:53 +0000 |
| commit | 0b4a33889441f9b04f6d0344be80b60b2f4465b9 (patch) | |
| tree | 54b8c7b58329e21b7d33c0a53af305b11d28c5ae /network_io | |
| parent | 0f9bec1ff8867743822886253e3e0a94a706714e (diff) | |
| download | apr-0b4a33889441f9b04f6d0344be80b60b2f4465b9.tar.gz | |
Only fill in apr_sockaddr_vars_set if we have valid data
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1438958 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io')
| -rw-r--r-- | network_io/unix/sendrecv.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c index d50f4f0f6..fc1c20b7d 100644 --- a/network_io/unix/sendrecv.c +++ b/network_io/unix/sendrecv.c @@ -174,7 +174,14 @@ apr_status_t apr_socket_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock, return errno; } - apr_sockaddr_vars_set(from, from->sa.sin.sin_family, ntohs(from->sa.sin.sin_port)); + /* + * Check if we have a valid address. recvfrom() with MSG_PEEK may return + * success without filling in the address. + */ + if (from->salen > APR_OFFSETOF(struct sockaddr_in, sin_port)) { + apr_sockaddr_vars_set(from, from->sa.sin.sin_family, + ntohs(from->sa.sin.sin_port)); + } (*len) = rv; if (rv == 0 && sock->type == SOCK_STREAM) { |