sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-21 12:23:50 +03:00
Code Activity

r12073: fix vlgrind error, calculate the correct size for memcpy()

Browse Source 
and don't assume out_len is >= sizeof(*in_addr)

metze
This commit is contained in:
Stefan Metzmacher
2005-12-05 15:22:38 +00:00
committed by Gerald (Jerry) Carter
parent 47ce4286de
commit 61dbe9e507
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/lib/socket_wrapper/socket_wrapper.c
View File

@@ -357,16 +357,23 @@ static int sockaddr_convert_from_un(const struct socket_info *si,
socklen_t un_addrlen,
int family,
struct sockaddr *out_addr,
socklen_t *out_len)
socklen_t *_out_addrlen)
{
if (out_addr == NULL || out_len == NULL)
socklen_t out_addrlen;
if (out_addr == NULL || _out_addrlen == NULL)
return 0;
if (un_addrlen == 0) {
*out_len = 0;
*_out_addrlen = 0;
return 0;
}
out_addrlen = *_out_addrlen;
if (out_addrlen > un_addrlen) {
out_addrlen = un_addrlen;
}
switch (family) {
case AF_INET:
switch (si->type) {
@@ -377,10 +384,10 @@ static int sockaddr_convert_from_un(const struct socket_info *si,
errno = ESOCKTNOSUPPORT;
return -1;
}
return convert_un_in(in_addr, (struct sockaddr_in *)out_addr, out_len);
return convert_un_in(in_addr, (struct sockaddr_in *)out_addr, _out_addrlen);
case AF_UNIX:
memcpy(out_addr, in_addr, sizeof(*in_addr));
*out_len = sizeof(*in_addr);
memcpy(out_addr, in_addr, out_addrlen);
*_out_addrlen = out_addrlen;
return 0;
default:
break;