Skip to content
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

Jump to bottom

topoh: memory leak fix for API call #3456

Merged
merged 1 commit into from
May 17, 2023
Merged

topoh: memory leak fix for API call #3456

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 7 additions & 29 deletions src/modules/topoh/th_msg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,11 +542,8 @@ int th_unmask_callid(sip_msg_t *msg)
return 0;
}

#define TH_CALLID_SIZE 256

int th_mask_callid_str(str *icallid, str *ocallid)
{
static char th_callid_mbuf[TH_CALLID_SIZE];
str out;

if(th_param_mask_callid==0)
Expand All @@ -565,27 +562,17 @@ int th_mask_callid_str(str *icallid, str *ocallid)
LM_ERR("cannot encode call-id\n");
return -1;
}

if(out.len>=TH_CALLID_SIZE) {
pkg_free(out.s);
LM_ERR("not enough callid buf size (needed %d)\n", out.len);
return -2;
}

memcpy(th_callid_mbuf, out.s, out.len);
th_callid_mbuf[out.len] = '\0';

pkg_free(out.s);

ocallid->s = th_callid_mbuf;

out.s[out.len] = '\0';
ocallid->s = out.s;
ocallid->len = out.len;

return 0;
}

int th_unmask_callid_str(str *icallid, str *ocallid)
{
static char th_callid_buf[TH_CALLID_SIZE];

str out;

if(th_param_mask_callid==0)
Expand All @@ -610,18 +597,9 @@ int th_unmask_callid_str(str *icallid, str *ocallid)
LM_ERR("failed to decode call-id\n");
return -2;
}
if(out.len>=TH_CALLID_SIZE) {
pkg_free(out.s);
LM_ERR("not enough callid buf size (needed %d)\n", out.len);
return -2;
}

memcpy(th_callid_buf, out.s, out.len);
th_callid_buf[out.len] = '\0';

pkg_free(out.s);

ocallid->s = th_callid_buf;

out.s[out.len] = '\0';
ocallid->s = out.s;
ocallid->len = out.len;

return 0;
Expand Down