Skip to content

Fix double-free in FreeBSD socket-table error handling #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hugojosealmeida wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix double-free in FreeBSD socket-table error handling #387

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions lib/dialects/freebsd/dsock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ static int cmp_xinpcb_sock_pcb(const void *a, const void *b) {
return 0;
}

/* PCB buffers are owned by the caller, including on failure. */
static int get_unix_pcbs(const char *name, struct xunpcb **pcbs,
size_t *n_pcbs) {
size_t len;
Expand Down Expand Up @@ -149,8 +150,6 @@ static int get_unix_pcbs(const char *name, struct xunpcb **pcbs,
end:
*pcbs = (struct xunpcb *)buffer;
*n_pcbs = count;
if (ret)
free(buffer);
return ret;
}

Expand Down Expand Up @@ -181,8 +180,6 @@ static int get_tcp_pcbs(struct xtcpcb **pcbs, size_t *n_pcbs) {
end:
*pcbs = (struct xtcpcb *)buffer;
*n_pcbs = count;
if (ret)
free(buffer);
return ret;
}

Expand Down Expand Up @@ -213,9 +210,7 @@ static int get_udp_pcbs(struct xinpcb **pcbs, size_t *n_pcbs) {
end:
*pcbs = (struct xinpcb *)buffer;
*n_pcbs = count;
if (ret)
free(buffer);
return 0;
return ret;
}

struct pcb_lists *read_pcb_lists(void) {
Expand Down
Loading