Skip to content

GCVCALLP-2360: Crash fix for topology hiding #125

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

Merged
davidtrihy-genesys merged 2 commits into from
Jan 12, 2026
Merged

GCVCALLP-2360: Crash fix for topology hiding #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d3f42c
GCVCALLP-2360: Crash fix for topology hiding
davidtrihy-genesys Jan 12, 2026
3be2726
GCVCALLP-2360: Remove errant error log
davidtrihy-genesys Jan 12, 2026
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: 6 additions & 3 deletions modules/topology_hiding/topo_hiding_logic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1666,6 +1666,7 @@ static char* build_encoded_contact_suffix(struct sip_msg* msg, str *routes, str*
param_t *it;
rr_t *head = NULL;
int is_req = (msg->first_line.type==SIP_REQUEST)?1:0;
int params_len = 0;
int local_len = sizeof(short) /* RR length */ +
sizeof(short) /* Contact length */ +
sizeof(short) /* RR length */ +
Expand Down Expand Up @@ -1729,7 +1730,7 @@ static char* build_encoded_contact_suffix(struct sip_msg* msg, str *routes, str*
/* we just iterate over the unknown params */
for (i=0;i<ctu.u_params_no;i++) {
if (str_match(&el->param_name, &ctu.u_name[i]))
suffix_len += topo_ct_param_len(&ctu.u_name[i], &ctu.u_val[i], 0);
params_len += topo_ct_param_len(&ctu.u_name[i], &ctu.u_val[i], 0);
}
}
}
Expand All @@ -1745,12 +1746,14 @@ static char* build_encoded_contact_suffix(struct sip_msg* msg, str *routes, str*
for (el=th_hdr_param_list;el;el=el->next) {
for (it=((contact_body_t *)msg->contact->parsed)->contacts->params;it;it=it->next) {
if (str_match(&el->param_name, &it->name))
suffix_len += topo_ct_param_len(&it->name, &it->body, 1);
params_len += topo_ct_param_len(&it->name, &it->body, 1);
}
}
}
}

total_len += params_len;

suffix_enc = pkg_malloc(total_len+1);
if (!suffix_enc) {
LM_ERR("no more pkg\n");
Expand Down Expand Up @@ -1837,7 +1840,7 @@ static int topo_no_dlg_encode_contact(struct sip_msg *msg, unsigned int flags, s
{
struct lump* lump;
char *prefix=NULL,*suffix=NULL,*ct_username=NULL;
int prefix_len,suffix_len,ct_username_len=0;
int prefix_len,suffix_len = 0,ct_username_len=0;
struct sip_uri ctu;
str contact;

Expand Down
21 changes: 10 additions & 11 deletions parser/parse_rr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,15 +354,15 @@ int shm_duplicate_rr(rr_t** _new, rr_t* _r, int first)
int print_rr_body_ignore(struct hdr_field *iroute, str *oroute, int order,
int no_change, str *rrs_to_ignore)
{
rr_t *p, *ignored = NULL;
int n = 0;
rr_t *p;
int n = 0, nr=0;
int i = 0;
int route_len;
#define MAX_RR_HDRS 64
static str route[MAX_RR_HDRS];
str s_rr;
char *cp, *start;
struct hdr_field tmp, *hdr;
str s_rr = STR_NULL;

if(iroute==NULL)
return 0;
Expand Down Expand Up @@ -391,18 +391,17 @@ int print_rr_body_ignore(struct hdr_field *iroute, str *oroute, int order,
s_rr.s = p->nameaddr.name.s;
s_rr.len = p->len;
if (str_strstr(rrs_to_ignore, &s_rr) == NULL) {
route[n].s = s_rr.s;
route[n].len = s_rr.len;
route[n].s = p->nameaddr.name.s;
route[n].len = p->len;
LM_DBG("current rr is %.*s\n", route[n].len, route[n].s);

route_len += route[n].len;
n++;
route_len += route[i].len;
if (n==MAX_RR_HDRS)
if(n==MAX_RR_HDRS)
{
LM_ERR("too many RR\n");
goto error;
}
s_rr = STR_NULL;
}
p = p->next;
}
Expand All @@ -411,9 +410,9 @@ int print_rr_body_ignore(struct hdr_field *iroute, str *oroute, int order,
iroute = iroute->sibling;
}

route_len += (n - 1); /* for commas */
route_len += n - 1; /* for commas */

oroute->s = (char*)pkg_malloc(route_len);
oroute->s = (char*) pkg_malloc(route_len);

if(oroute->s==0)
{
Expand Down Expand Up @@ -444,7 +443,7 @@ int print_rr_body_ignore(struct hdr_field *iroute, str *oroute, int order,
*(cp++) = ',';
}
}
oroute->len=cp - start;
oroute->len = route_len;

LM_DBG("out rr [%.*s]\n", oroute->len, oroute->s);
LM_DBG("we have %i records\n", n);
Expand Down
Loading