Skip to content

janus: fix pkg memory leaks in cJSON_Print/cJSON_Parse paths #3839

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
NormB wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −0
Open

janus: fix pkg memory leaks in cJSON_Print/cJSON_Parse paths #3839

Show file tree
Hide file tree
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: 9 additions & 0 deletions modules/janus/janus_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ int janus_raise_event(janus_connection *conn, cJSON *request)
}

full_json = cJSON_Print(request);
if (!full_json) {
LM_ERR("cJSON_Print failed\n");
goto err_free_params;
}
cJSON_Minify(full_json);
full_json_s.s = full_json;
full_json_s.len = strlen(full_json);
Expand Down Expand Up @@ -191,10 +195,15 @@ int handle_janus_json_request(janus_connection *conn, cJSON *request)
}

full_json = cJSON_Print(request);
if (!full_json) {
LM_ERR("cJSON_Print failed\n");
return 1;
}
cJSON_Minify(full_json);

reply->text.s = shm_strdup(full_json);
if (reply->text.s == NULL) {
pkg_free(full_json);
/* we're out of mem, let the requestor timeout, don't disconnect janus */
return 1;
}
Expand Down
2 changes: 2 additions & 0 deletions modules/janus/janus_mod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,14 @@ static int w_janus_send_request(struct sip_msg *msg, str *janus_id,str *request,

if ((conn = get_janus_connection_by_id(janus_id)) == NULL) {
LM_ERR("Unknown JANUS ID %.*s\n",janus_id->len,janus_id->s);
cJSON_Delete(j_request);
return -1;
}

LM_DBG("Found our conn, prep to send out %.*s !! \n",request->len,request->s);

reply_id = janus_ipc_send_request(conn,j_request);
cJSON_Delete(j_request); /* tree was serialized to shm; free pkg copy */
if (reply_id == 0) {
LM_ERR("Failed to queue request %.*s towards %.*s\n",
request->len,request->s,
Expand Down
9 changes: 9 additions & 0 deletions modules/janus/janus_proc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,14 +282,23 @@ uint64_t janus_ipc_send_request(janus_connection *sock, cJSON *janus_cmd)
lock_stop_write(sock->lists_lk);

full_cmd.s = cJSON_Print(janus_cmd);
if (!full_cmd.s) {
shm_free(cmd);
LM_ERR("cJSON_Print failed (pkg OOM)\n");
return 0;
}
full_cmd.len = strlen(full_cmd.s);

if (shm_nt_str_dup(&cmd->janus_cmd, &full_cmd) != 0) {
pkg_free(full_cmd.s);
shm_free(cmd);
LM_ERR("oom\n");
return 0;
}

/* cJSON_Print() allocates from pkg via module hooks; free after shm copy */
pkg_free(full_cmd.s);

janus_transaction_id = cmd->janus_transaction_id;

if (ipc_send_job(*janus_mgr_process_no, ipc_hdl_run_janus, cmd) != 0) {
Expand Down