sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-04 16:58:42 +03:00
Code

nwrap: Fix memory leak in nwrap_gethostbyname_r()

Browse Source 
Fix reimplements how memory is used.
Results from vector are copied to user provided buf.

Signed-off-by: Robin Hack <hack.robin@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Robin Hack 2015-10-12 10:36:04 +02:00 committed by Michael Adam
parent 43d470a06f
commit 200f5bf138
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/nss_wrapper/nss_wrapper.c
View File

@ -3406,7 +3406,21 @@ static int nwrap_gethostbyname_r(const char *name,
return -1; return -1;
} }
memset(buf, '\0', buflen); if (buflen < (addr_list->count * sizeof(void *))) {
SAFE_FREE(addr_list->items);
SAFE_FREE(addr_list);
return ERANGE;
}
/* Copy all to user provided buffer and change
* pointers in returned structure.
* +1 is for ending NULL pointer. */
memcpy(buf, addr_list->items, (addr_list->count + 1) * sizeof(void *));
free(addr_list->items);
free(addr_list);
ret->h_addr_list = (char **)buf;
*result = ret; *result = ret;
return 0; return 0;
} }