sr-dev January 2023

sr-dev@lists.kamailio.org

14 participants
276 discussions

git:master:9142d589: app_python3: use local var to avoid overlapping values when casting

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9142d58906eb9327a24290737b833d79dc2d605c URL: https://github.com/kamailio/kamailio/commit/9142d58906eb9327a24290737b833d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T13:46:48+01:00 app_python3: use local var to avoid overlapping values when casting --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/9142d58906eb9327a24290737b833d7… Patch: https://github.com/kamailio/kamailio/commit/9142d58906eb9327a24290737b833d7… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 71bc849e118..1fe02c5bac8 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -312,7 +312,8 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg } if(ket->ptypes[i]==SR_KEMIP_INT) { vps[i].vtype = SR_KEMIP_INT; - vps[i].v.n = (int)vps[i].v.l; + ret = (int)vps[i].v.l; + vps[i].v.n = ret; } else { vps[i].vtype = SR_KEMIP_LONG; }

1 year, 4 months

git:master:a5dcd979: app_python: use local var to avoid overlapping values when casting

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a5dcd9794d6a26469968f8d9d3ee79af8a6e0142 URL: https://github.com/kamailio/kamailio/commit/a5dcd9794d6a26469968f8d9d3ee79a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T13:46:06+01:00 app_python: use local var to avoid overlapping values when casting --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/a5dcd9794d6a26469968f8d9d3ee79a… Patch: https://github.com/kamailio/kamailio/commit/a5dcd9794d6a26469968f8d9d3ee79a… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 9a1e635c1a6..3d4d6d342d7 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -316,7 +316,8 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, } if(ket->ptypes[i]==SR_KEMIP_INT) { vps[i].vtype = SR_KEMIP_INT; - vps[i].v.n = (int)vps[i].v.l; + ret = (int)vps[i].v.l; + vps[i].v.n = ret; } else { vps[i].vtype = SR_KEMIP_LONG; }

1 year, 4 months

git:master:f8fdd336: rtp_media_server: return or continue on null values inside rms_dialog_action_check()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f8fdd336504702d9353b1ab7a1ffabca5ff4723e URL: https://github.com/kamailio/kamailio/commit/f8fdd336504702d9353b1ab7a1ffabc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T13:28:50+01:00 rtp_media_server: return or continue on null values inside rms_dialog_action_check() --- Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/f8fdd336504702d9353b1ab7a1ffabc… Patch: https://github.com/kamailio/kamailio/commit/f8fdd336504702d9353b1ab7a1ffabc… --- diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index ac1e8ba73b..07a2eb83a6 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -240,12 +240,16 @@ static rms_dialog_info_t *rms_stop(rms_dialog_info_t *di) static rms_dialog_info_t *rms_dialog_action_check(rms_dialog_info_t *di) { rms_action_t *a; - if (!di) - LM_ERR("Dialog info NULL\n"); + if (!di) { + LM_ERR("Dialog info NULL\n"); + return NULL; + } clist_foreach(&di->action, a, next) { - if (!a) + if (!a) { LM_ERR("dialog action NULL\n"); + continue; + } if(a->type == RMS_HANGUP) { LM_INFO("dialog action RMS_HANGUP [%s]\n", di->callid.s);

1 year, 4 months

git:master:ebe0466a: rtp_media_server: safety check on error inside rms_dialog_new()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ebe0466a35b9ef3ed1f754c8cb63d5df766ae499 URL: https://github.com/kamailio/kamailio/commit/ebe0466a35b9ef3ed1f754c8cb63d5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T13:26:15+01:00 rtp_media_server: safety check on error inside rms_dialog_new() --- Modified: src/modules/rtp_media_server/rms_dialog_info.c --- Diff: https://github.com/kamailio/kamailio/commit/ebe0466a35b9ef3ed1f754c8cb63d5d… Patch: https://github.com/kamailio/kamailio/commit/ebe0466a35b9ef3ed1f754c8cb63d5d… --- diff --git a/src/modules/rtp_media_server/rms_dialog_info.c b/src/modules/rtp_media_server/rms_dialog_info.c index 824eca3f91..ea0384e769 100644 --- a/src/modules/rtp_media_server/rms_dialog_info.c +++ b/src/modules/rtp_media_server/rms_dialog_info.c @@ -274,7 +274,9 @@ rms_dialog_info_t *rms_dialog_new(struct sip_msg *msg) return si; error: LM_ERR("can not create dialog info.\n"); - rms_dialog_free(si); + if(si) { + rms_dialog_free(si); + } return NULL; }

1 year, 4 months

git:master:04d02692: rtp_media_server: check before free

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 04d0269298b9816a384a70439fa75b1bee20df46 URL: https://github.com/kamailio/kamailio/commit/04d0269298b9816a384a70439fa75b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T13:24:37+01:00 rtp_media_server: check before free --- Modified: src/modules/rtp_media_server/rms_dialog_info.c --- Diff: https://github.com/kamailio/kamailio/commit/04d0269298b9816a384a70439fa75b1… Patch: https://github.com/kamailio/kamailio/commit/04d0269298b9816a384a70439fa75b1… --- diff --git a/src/modules/rtp_media_server/rms_dialog_info.c b/src/modules/rtp_media_server/rms_dialog_info.c index efd4c26f68..824eca3f91 100644 --- a/src/modules/rtp_media_server/rms_dialog_info.c +++ b/src/modules/rtp_media_server/rms_dialog_info.c @@ -199,27 +199,31 @@ rms_dialog_info_t *rms_dialog_new_bleg(struct sip_msg *msg) return NULL; rms_dialog_info_t *si = shm_malloc(sizeof(rms_dialog_info_t)); if(!si) { - LM_ERR("can not allocate dialog info !\n"); + LM_ERR("can not allocate dialog info!\n"); goto error; } memset(si, 0, sizeof(rms_dialog_info_t)); if(!rms_str_dup(&si->callid, &msg->callid->body, 1)) { - LM_ERR("can not get callid .\n"); + LM_ERR("can not get callid\n"); goto error; } - if(!rms_str_dup(&si->remote_uri, &msg->from->body, 1)) + if(!rms_str_dup(&si->remote_uri, &msg->from->body, 1)) { goto error; + } str ip; ip.s = ip_addr2a(&msg->rcv.dst_ip); ip.len = strlen(ip.s); - if(!rms_str_dup(&si->local_ip, &ip, 1)) + if(!rms_str_dup(&si->local_ip, &ip, 1)) { goto error; + } clist_init(&si->action, next, prev); return si; error: LM_ERR("can not create dialog info.\n"); - rms_dialog_free(si); + if(si) { + rms_dialog_free(si); + } return NULL; }

1 year, 4 months

git:master:72cd0ac5: app_python3s: checks for function execution handler

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 72cd0ac533d4e6b881aa5e4f2e1724c6da312ca2 URL: https://github.com/kamailio/kamailio/commit/72cd0ac533d4e6b881aa5e4f2e1724c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T13:21:27+01:00 app_python3s: checks for function execution handler --- Modified: src/modules/app_python3s/app_python3s_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/72cd0ac533d4e6b881aa5e4f2e1724c… Patch: https://github.com/kamailio/kamailio/commit/72cd0ac533d4e6b881aa5e4f2e1724c… --- diff --git a/src/modules/app_python3s/app_python3s_mod.c b/src/modules/app_python3s/app_python3s_mod.c index ba68d019e2..f2614f27a8 100644 --- a/src/modules/app_python3s/app_python3s_mod.c +++ b/src/modules/app_python3s/app_python3s_mod.c @@ -323,7 +323,9 @@ int apy3s_script_init_exec(PyObject* pModule, str *fname, int *vparam) if (PyErr_Occurred()) { LM_ERR("error exception occurred\n"); apy3s_handle_exception("script_init"); - Py_DECREF(pHandler); + if (pHandler != NULL) { + Py_DECREF(pHandler); + } goto error; } @@ -331,11 +333,10 @@ int apy3s_script_init_exec(PyObject* pModule, str *fname, int *vparam) LM_ERR("PyObject_CallObject() returned NULL but no exception!\n"); if (!PyErr_Occurred()) PyErr_Format(PyExc_TypeError, - "Function '%s' of module '%s' has returned not returned" - " object. Should be a class instance.", + "Function '%s' of module '%s' has not returned" + " an object. Should be a class instance.", fname->s, _sr_apy3s_bname); apy3s_handle_exception("script_init"); - Py_DECREF(pHandler); goto error; } Py_XDECREF(pHandler);

1 year, 4 months

git:master:c818c34d: rtp_media_server: safety checks for call media leg variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c818c34d7d70a24c07d25e61b862971388f635f4 URL: https://github.com/kamailio/kamailio/commit/c818c34d7d70a24c07d25e61b862971… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T13:17:24+01:00 rtp_media_server: safety checks for call media leg variable --- Modified: src/modules/rtp_media_server/rms_media.c --- Diff: https://github.com/kamailio/kamailio/commit/c818c34d7d70a24c07d25e61b862971… Patch: https://github.com/kamailio/kamailio/commit/c818c34d7d70a24c07d25e61b862971… --- diff --git a/src/modules/rtp_media_server/rms_media.c b/src/modules/rtp_media_server/rms_media.c index b1439c4a4e..d79f0a6d5f 100644 --- a/src/modules/rtp_media_server/rms_media.c +++ b/src/modules/rtp_media_server/rms_media.c @@ -109,7 +109,10 @@ int create_session_payload(call_leg_media_t *m) { int create_call_leg_media(call_leg_media_t *m) { - if (m) rms_stop_media(m); + if (!m) { + return 0; + } + rms_stop_media(m); m->ms_factory = rms_create_factory(); // Create caller RTP session LM_INFO("RTP session [%s:%d]<>[%s:%d]\n", m->local_ip.s, m->local_port, @@ -192,7 +195,10 @@ int rms_start_media(call_leg_media_t *m, char *file_name) int channels = 1; int file_sample_rate = 8000; - if (m) rms_stop_media(m); + if (!m) { + goto error; + } + rms_stop_media(m); m->ms_ticker = rms_create_ticker(NULL); if(!m->ms_ticker)

1 year, 4 months

git:master:408cad8c: rtp_media_server: reorder code for rms_payload_type_new() to update field after memset

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 408cad8cd67f1c3568fddb0f6b6fcc715ecec181 URL: https://github.com/kamailio/kamailio/commit/408cad8cd67f1c3568fddb0f6b6fcc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T13:13:11+01:00 rtp_media_server: reorder code for rms_payload_type_new() to update field after memset --- Modified: src/modules/rtp_media_server/rms_sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/408cad8cd67f1c3568fddb0f6b6fcc7… Patch: https://github.com/kamailio/kamailio/commit/408cad8cd67f1c3568fddb0f6b6fcc7… --- diff --git a/src/modules/rtp_media_server/rms_sdp.c b/src/modules/rtp_media_server/rms_sdp.c index b3330f58f0..f263e2622f 100644 --- a/src/modules/rtp_media_server/rms_sdp.c +++ b/src/modules/rtp_media_server/rms_sdp.c @@ -187,8 +187,11 @@ PayloadType * rms_payload_type_new() // This could be problematic as it must remain compatible with the constructor in MS2. { PayloadType *newpayload = (PayloadType *)shm_malloc(sizeof(PayloadType)); - newpayload->flags |= PAYLOAD_TYPE_ALLOCATED; + if(!newpayload) { + return NULL; + } memset(newpayload, 0, sizeof(PayloadType)); + newpayload->flags |= PAYLOAD_TYPE_ALLOCATED; return newpayload; }

1 year, 4 months

git:master:f6dd56c8: rtp_media_server: safety check for shm allocation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f6dd56c8405189d0dcc16bd5d79927e919e8b572 URL: https://github.com/kamailio/kamailio/commit/f6dd56c8405189d0dcc16bd5d79927e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T13:12:06+01:00 rtp_media_server: safety check for shm allocation --- Modified: src/modules/rtp_media_server/rms_sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/f6dd56c8405189d0dcc16bd5d79927e… Patch: https://github.com/kamailio/kamailio/commit/f6dd56c8405189d0dcc16bd5d79927e… --- diff --git a/src/modules/rtp_media_server/rms_sdp.c b/src/modules/rtp_media_server/rms_sdp.c index c313d13646..b3330f58f0 100644 --- a/src/modules/rtp_media_server/rms_sdp.c +++ b/src/modules/rtp_media_server/rms_sdp.c @@ -251,6 +251,9 @@ PayloadType *rms_sdp_select_payload(rms_sdp_info_t *sdp) char *payloads = sdp->payloads.s; char *payload_type_number = strtok(payloads, " "); + if (!pt) { + return NULL; + } while (payload_type_number) { pt->type = atoi(payload_type_number); pt = rms_sdp_check_payload_type(pt, sdp); @@ -259,7 +262,7 @@ PayloadType *rms_sdp_select_payload(rms_sdp_info_t *sdp) } if (!pt->mime_type) { LM_INFO("unsuported codec\n"); - if (pt) shm_free(pt); // payload_type_destroy(pt); + shm_free(pt); // payload_type_destroy(pt); return NULL; } LM_INFO("payload_type:%d %s/%d/%d\n", pt->type, pt->mime_type,

1 year, 4 months

git:master:19387803: app_python3s: restore backup reference to sip msg

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1938780339677596bf547794c4b54b7923405166 URL: https://github.com/kamailio/kamailio/commit/1938780339677596bf547794c4b54b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T13:07:58+01:00 app_python3s: restore backup reference to sip msg --- Modified: src/modules/app_python3s/apy3s_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/1938780339677596bf547794c4b54b7… Patch: https://github.com/kamailio/kamailio/commit/1938780339677596bf547794c4b54b7… --- diff --git a/src/modules/app_python3s/apy3s_kemi.c b/src/modules/app_python3s/apy3s_kemi.c index 9eb58146e4c..e00eadd8105 100644 --- a/src/modules/app_python3s/apy3s_kemi.c +++ b/src/modules/app_python3s/apy3s_kemi.c @@ -149,6 +149,7 @@ int apy3s_exec_func(sip_msg_t *_msg, char *fname, char *fparam, int emode) rval = (int)PyLong_AsLong(pValue); Py_DECREF(pValue); + _sr_apy_env.msg = bmsg; error: if(locked) {

1 year, 4 months

← Newer
1
...
21
22
23
24
25
26
27
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2023