Skip to content

aaa_diameter: fix SHM cJSON leaks and double-free found after 1e8001fa0 #3882

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
dondetir wants to merge 2 commits into
base: master
Choose a base branch
from
Open

aaa_diameter: fix SHM cJSON leaks and double-free found after 1e8001fa0 #3882

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
569b1eb
aaa_diameter: always release reply cJSON regardless of output PV
dondetir Apr 28, 2026
77a2307
aaa_diameter: fix double-free of cJSON item in dm_avps2json()
dondetir Apr 28, 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
5 changes: 2 additions & 3 deletions modules/aaa_diameter/aaa_diameter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,8 @@ static int dm_send_request(struct sip_msg *msg, int *app_id, int *cmd_code,
pv_value_t val = {(str){rpl_avps, strlen(rpl_avps)}, 0, PV_VAL_STR};
if (pv_set_value(msg, rpl_avps_pv, 0, &val) != 0)
LM_ERR("failed to set output rpl_avps pv to: %s\n", rpl_avps);
_dm_release_message_response(rpl, rpl_avps);
}
_dm_release_message_response(rpl, rpl_avps);

if (rc != 0) {
LM_ERR("Diameter request failed (rc: %d)\n", rc);
Expand Down Expand Up @@ -521,8 +521,7 @@ static int dm_send_request_async_reply(int fd,
error:
if (amsg->ret && pv_set_value(msg, amsg->ret, 0, &val) != 0)
LM_ERR("failed to set output rpl_avps pv to NULL\n");
if (rpl_avps)
_dm_release_message_response(amsg->cond, rpl_avps);
_dm_release_message_response(amsg->cond, rpl_avps);
dm_free_sync_msg(amsg);
return ret;
}
Expand Down
3 changes: 2 additions & 1 deletion modules/aaa_diameter/dm_impl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,9 @@ static int dm_avps2json(void *root, cJSON *avps)
add:
cJSON_AddItemToObject(item, dm_avp.avp_name, val);
cJSON_AddItemToArray(avps, item);
item = NULL;

skip:
skip:
FD_CHECK_GT(fd_msg_browse(it, MSG_BRW_NEXT, &it, NULL));
i++;
}
Expand Down
Loading