sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

swrap: We need to pass a pointer-pointer to not leak memory.

Browse Source 
CID 63533

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Andreas Schneider 2014-06-03 15:06:33 +02:00 committed by Michael Adam
parent 353709b3f3
commit 74ade40e3e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/socket_wrapper/socket_wrapper.c
View File

@ -3196,14 +3196,14 @@ static int swrap_msghdr_add_socket_info(struct socket_info *si,
}
static int swrap_sendmsg_copy_cmsg(struct cmsghdr *cmsg,
uint8_t *cm_data,
uint8_t **cm_data,
size_t *cm_data_space);
static int swrap_sendmsg_filter_cmsg_socket(struct cmsghdr *cmsg,
uint8_t *cm_data,
uint8_t **cm_data,
size_t *cm_data_space);
static int swrap_sendmsg_filter_cmsghdr(struct msghdr *msg,
uint8_t *cm_data,
uint8_t **cm_data,
size_t *cm_data_space) {
struct cmsghdr *cmsg;
int rc = -1;
@ -3234,7 +3234,7 @@ static int swrap_sendmsg_filter_cmsghdr(struct msghdr *msg,
}
static int swrap_sendmsg_copy_cmsg(struct cmsghdr *cmsg,
uint8_t *cm_data,
uint8_t **cm_data,
size_t *cm_data_space)
{
size_t cmspace;
@ -3244,13 +3244,13 @@ static int swrap_sendmsg_copy_cmsg(struct cmsghdr *cmsg,
(*cm_data_space) +
CMSG_SPACE(cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr)));
p = realloc(cm_data, cmspace);
p = realloc((*cm_data), cmspace);
if (p == NULL) {
return -1;
}
cm_data = p;
(*cm_data) = p;
p = cm_data + (*cm_data_space);
p = (*cm_data) + (*cm_data_space);
*cm_data_space = cmspace;
memcpy(p, cmsg, cmsg->cmsg_len);
@ -3259,12 +3259,12 @@ static int swrap_sendmsg_copy_cmsg(struct cmsghdr *cmsg,
}
static int swrap_sendmsg_filter_cmsg_pktinfo(struct cmsghdr *cmsg,
uint8_t *cm_data,
uint8_t **cm_data,
size_t *cm_data_space);
static int swrap_sendmsg_filter_cmsg_socket(struct cmsghdr *cmsg,
uint8_t *cm_data,
uint8_t **cm_data,
size_t *cm_data_space)
{
int rc = -1;
@ -3292,7 +3292,7 @@ static int swrap_sendmsg_filter_cmsg_socket(struct cmsghdr *cmsg,
}
static int swrap_sendmsg_filter_cmsg_pktinfo(struct cmsghdr *cmsg,
uint8_t *cm_data,
uint8_t **cm_data,
size_t *cm_data_space)
{
(void)cmsg; /* unused */
@ -3432,7 +3432,7 @@ static ssize_t swrap_sendmsg_before(int fd,
uint8_t *cmbuf = NULL;
size_t cmlen = 0;
ret = swrap_sendmsg_filter_cmsghdr(msg, cmbuf, &cmlen);
ret = swrap_sendmsg_filter_cmsghdr(msg, &cmbuf, &cmlen);
if (ret < 0) {
free(cmbuf);
return -1;