- sr-dev - kamailio.org

git:master:6a7c8c23: etc/kamailio.cfg: use send_reply_error() instead of sl_reply_error()
by Daniel-Constantin Mierla 18 Feb '25

18 Feb '25

Module: kamailio Branch: master Commit: 6a7c8c232132078b97bd3023efaed30f369cfe63 URL: https://github.com/kamailio/kamailio/commit/6a7c8c232132078b97bd3023efaed30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-18T13:21:25+01:00 etc/kamailio.cfg: use send_reply_error() instead of sl_reply_error() --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/6a7c8c232132078b97bd3023efaed30… Patch: https://github.com/kamailio/kamailio/commit/6a7c8c232132078b97bd3023efaed30… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index a06e09fdc77..a46f5734bfc 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -634,7 +634,7 @@ route[RELAY] { } if (!t_relay()) { - sl_reply_error(); + send_reply_error(); } exit; } @@ -742,7 +742,7 @@ route[REGISTRAR] { #!endif } if (!save("location")) { - sl_reply_error(); + send_reply_error(); } exit; } @@ -808,7 +808,7 @@ route[PRESENCE] { msg_apply_changes(); #!endif if (!t_newtran()) { - sl_reply_error(); + send_reply_error(); exit; }

1 0

git:master:357766ba: tm: docs for delayed_reply param
by Daniel-Constantin Mierla 18 Feb '25

18 Feb '25

Module: kamailio Branch: master Commit: 357766ba470401845b3ec2222e6fc11031823ee3 URL: https://github.com/kamailio/kamailio/commit/357766ba470401845b3ec2222e6fc11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-18T13:20:48+01:00 tm: docs for delayed_reply param --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/357766ba470401845b3ec2222e6fc11… Patch: https://github.com/kamailio/kamailio/commit/357766ba470401845b3ec2222e6fc11… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index ad1f55e2061..1dd77f1df3f 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1740,5 +1740,26 @@ modparam("tm", "reply_408_reason", "Gone") </example> </section> + <section id="tm.p.rdelayed_reply"> + <title><varname>delayed_reply</varname> (int)</title> + <para> + If set to 1, the reply generation in case of request + processing/forwarding error is delayed till the config script + execution ends. This allows the script writer to send its + own error reply. If set to 0, the transaction is replied and killed + immediately. + </para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + <example> + <title>delayed_reply example</title> + <programlisting> +... +modparam("tm", "delayed_reply", 0) +.... + </programlisting> + </example> + </section> </section>

1 0

git:master:a705e601: tm: made TM_DELAYED_REPLY modparam delayed_reply
by Daniel-Constantin Mierla 18 Feb '25

18 Feb '25

Module: kamailio Branch: master Commit: a705e601d9924118ed6d79b21e92fd2af0267a05 URL: https://github.com/kamailio/kamailio/commit/a705e601d9924118ed6d79b21e92fd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-18T13:14:16+01:00 tm: made TM_DELAYED_REPLY modparam delayed_reply - GH #4140 --- Modified: src/modules/tm/t_funcs.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/a705e601d9924118ed6d79b21e92fd2… Patch: https://github.com/kamailio/kamailio/commit/a705e601d9924118ed6d79b21e92fd2… --- diff --git a/src/modules/tm/t_funcs.c b/src/modules/tm/t_funcs.c index 55510742b39..dd14f83a15c 100644 --- a/src/modules/tm/t_funcs.c +++ b/src/modules/tm/t_funcs.c @@ -43,7 +43,7 @@ /* if defined t_relay* error reply generation will be delayed till script * end (this allows the script writer to send its own error reply) */ -#define TM_DELAYED_REPLY +extern int _tm_delayed_reply; #ifdef USE_DNS_FAILOVER extern int **failover_reply_codes; @@ -232,9 +232,7 @@ int t_relay_to( unsigned short port; str host; short comp; -#ifndef TM_DELAYED_REPLY int reply_ret; -#endif ret = 0; @@ -354,26 +352,25 @@ int t_relay_to( ret = -4; goto done; } -#ifdef TM_DELAYED_REPLY - /* current error in tm_error */ - tm_error = ser_error; - set_kr(REQ_ERR_DELAYED); - LM_DBG("%d error reply generation delayed \n", ser_error); -#else - - reply_ret = kill_transaction(t, ser_error); - if(reply_ret > 0) { - /* we have taken care of all -- do nothing in - script */ - LM_DBG("generation of a stateful reply " - "on error succeeded\n"); - /*ret=0; -- we don't want to stop the script */ + if(_tm_delayed_reply != 0) { + /* current error in tm_error */ + tm_error = ser_error; + set_kr(REQ_ERR_DELAYED); + LM_DBG("%d error reply generation delayed \n", ser_error); } else { - LM_DBG("generation of a stateful reply " - "on error failed\n"); - t_release_transaction(t); + reply_ret = kill_transaction(t, ser_error); + if(reply_ret > 0) { + /* we have taken care of all -- do nothing in + script */ + LM_DBG("generation of a stateful reply " + "on error succeeded\n"); + /*ret=0; -- we don't want to stop the script */ + } else { + LM_DBG("generation of a stateful reply " + "on error failed\n"); + t_release_transaction(t); + } } -#endif /* TM_DELAYED_REPLY */ } else { t_release_transaction(t); /* kill it silently */ } diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index b10200dab4e..d6f7423b3c1 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -229,6 +229,7 @@ int tm_remap_503_500 = 1; str _tm_event_callback_lres_sent = {NULL, 0}; int _tm_reply_408_code = 408; str _tm_reply_408_reason = str_init("Request Timeout"); +int _tm_delayed_reply = 1; #ifdef USE_DNS_FAILOVER str failover_reply_codes_str = {NULL, 0}; @@ -528,6 +529,7 @@ static param_export_t params[] = { #endif {"reply_408_code", PARAM_INT, &_tm_reply_408_code}, {"reply_408_reason", PARAM_STR, &_tm_reply_408_reason}, + {"delayed_reply", PARAM_INT, &_tm_delayed_reply}, {0, 0, 0} };

1 0

[kamailio/kamailio] Enhance TOPOH and TOPOS Modules to Mask IPs in Request-URI and From/To Headers (Issue #4148)
by Farzaneh Soltanzadeh 18 Feb '25

18 Feb '25

Fr-Soltanzadeh created an issue (kamailio/kamailio#4148)  ### Description  Kamailio's topoh and topos modules currently hide/strip certain SIP headers but do not mask IP addresses in the From, To, and Request-URI headers. This feature request proposes extending these modules to hide or replace IP addresses for improved privacy and security. ### Expected behavior When enabled, Kamailio should replace IPs in: From header To header Request-URI This should work without breaking SIP message integrity or routing. #### Actual observed behavior Currently, IP addresses in these headers remain visible, exposing topology information(172.16.100.88 in this example). ``` Request-Line: INVITE sip:9121001111@172.16.100.88 SIP/2.0 Message Header Record-Route: <sip:10.14.17.83:5060;r2=on;lr;did=24f.c2e1> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMbIUMBIUMZIUpA.Z1TwVXL.rlT.rHP8mBTyxnLnAjOaG**> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMbIUMBIUMZIUpB.UNbyUuEeU1X7r5E741E8xODwd1B8Y5TyUN*> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMbIUMBIUMZIUpB.Z1TwVXL.rlT.rHP8mBTyxnLaUn3> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMbIUMBIUMZIUpT.UNbyUuEeU1X7r5E741E8xODwd1B8YfUaAul> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMbIUMBIUMZIUpT.UNbyUMEo4jt7Cyb7ZjBw-HceA9TaU3s7U9ceU9DhVGXaUHRIRaAamM*> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMbIUMBIUMZIUp5.UNbyUMEo4jt7Cyb7ZjBw-HceA9TaU3s7U9ceU9DhVGXaUHRIUyU8UM*> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMZaY5lyY5lamuL.mpEeU1X7r5E741E8xODwd1B8Y5Anrnl> Via: SIP/2.0/UDP 10.14.17.83:5060;branch=z9hG4bKa514.f0b2dd496995e05c455b7c66f29e298a.0 Via: SIP/2.0/UDP 127.0.0.8;branch=z9hG4bKsr-NBOGIA1LaFXkHKupaduLadGLadeL.mGvyduram9TexXTomB3amnb.3H1wVHPoU9YeRKLnrpXzUO2HAHYSrM3adGLamyDaADZaUKt8m8UyAKUyUN5amGB8UKOarKDaAnBamnLau** Via: SIP/2.0/UDP 127.0.0.8;branch=z9hG4bKsr-NBOGIA1LaFXkHKupaduLadGLadeL.m1vyduram9TexXTomB3amnb.rjTnVfUhm3v.Vt4yxjIndNlyFfY8mpfnUnT8daf8VjYaU6D.xkO8m6R8der8dyUaAnZaS5b.rDXab** Via: SIP/2.0/UDP 127.0.0.8;branch=z9hG4bKsr-NBOGIA1LaFXNdKapaduLadGLadeL.mpvydurad9TexXTomBram1Z.m9YeRKLnrpXzUO2HAHYSrM3adGL8x8OyUeb.mD58mMZ8mjtnVNZax8R8dyU8dpByRNryVNLau** Via: SIP/2.0/UDP 127.0.0.8;branch=z9hG4bKsr-NBOGIA1LaFXkHKupadDTIUMr.F5TaF55ym2raUMB.d9T8VyOh-8O8mBl.d1Ladn5IU1bIUpB.Zjb7ZjBwdnTadGf.rjTnVfUhm3v.Vt4yxjINxPUad6OydaTnrNryrNBadyD.mabyrHtameZaVNbnAjYab** Max-Forwards: 66 From: <sip:9122001003@172.16.100.88>;tag=973f3044c163413fb5e7075113f96a7b To: <sip:9121001111@172.16.100.88> Contact: <sip:127.0.0.8;line=sr-erOb.UDlaU1bamMbamyuadDTIUMr.F5TaF55ym2raUMB.d9snp**> Call-ID: !!:yrnlaAtYadHOnRyRymjOydpT.d1faVKUymkRamalnAu* CSeq: 9661 INVITE Allow: PRACK, INVITE, ACK, BYE, CANCEL, UPDATE, INFO, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS Supported: replaces, 100rel, timer, norefersub Session-Expires: 1800 Min-SE: 90 User-Agent: MicroSIP/3.21.5 Content-Type: application/sdp Content-Length: 338 Message Body ``` #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  * Introduce a new configuration parameter in topoh and topos that enables masking or encoding of IP addresses in From, To, and Request-URI. * Ensure proper handling of subsequent SIP messages like ACK, BYE, and re-INVITE to maintain end-to-end communication. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 6.0.0 ``` * **Operating System**:  ``` uname ubuntu:22.04 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4148 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4148(a)github.com>

2 2

[kamailio/kamailio] kafka: Fix mod_destroy() crash (PR #4147)
by Stefan Mititelu 17 Feb '25

17 Feb '25

A crash happened on mod_destroy() due to librdkafka thrd_join(), in case of multiple restarts, in case of ssl kafka connection. Init kafka only for timer and routing processes. Add checks for rk pointer.   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4147 -- Commit Summary -- * kafka: Fix mod_destroy() crash -- File Changes -- M src/modules/kafka/kafka_mod.c (9) M src/modules/kafka/kfk.c (95) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4147.patch https://github.com/kamailio/kamailio/pull/4147.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4147 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4147(a)github.com>

2 4

git:master:10012eeb: kafka: Fix mod_destroy() crash
by Victor Seva 17 Feb '25

17 Feb '25

Module: kamailio Branch: master Commit: 10012eeb17210ea7eb9549dc71be5af7e92b4a97 URL: https://github.com/kamailio/kamailio/commit/10012eeb17210ea7eb9549dc71be5af… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-17T16:20:41+01:00 kafka: Fix mod_destroy() crash A crash happened on mod_destroy() due to librdkafka thrd_join(), in case of multiple restarts, in case of ssl kafka connection. Init kafka only for timer and routing processes. Add checks for rk pointer. --- Modified: src/modules/kafka/kafka_mod.c Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/10012eeb17210ea7eb9549dc71be5af… Patch: https://github.com/kamailio/kamailio/commit/10012eeb17210ea7eb9549dc71be5af…

1 0

git:master:5d3ae2ac: dialog: set keepalive local cseq value to 0
by Daniel-Constantin Mierla 16 Feb '25

16 Feb '25

Module: kamailio Branch: master Commit: 5d3ae2acfab38eda88c6369c0db18a286faba2e3 URL: https://github.com/kamailio/kamailio/commit/5d3ae2acfab38eda88c6369c0db18a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-16T12:06:57+01:00 dialog: set keepalive local cseq value to 0 --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/5d3ae2acfab38eda88c6369c0db18a2… Patch: https://github.com/kamailio/kamailio/commit/5d3ae2acfab38eda88c6369c0db18a2… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 25dbae3a54c..62b6aea1a9c 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -787,7 +787,7 @@ int dlg_send_ka(dlg_cell_t *dlg, int dir) if(di->loc_seq.value > 1) di->loc_seq.value -= 2; else - di->loc_seq.value -= 1; + di->loc_seq.value = 0; LM_DBG("sending OPTIONS to %s\n", (dir == DLG_CALLER_LEG) ? "caller" : "callee");

1 0

git:master:413c9020: core: socket info - print index values in error message for overflow
by Daniel-Constantin Mierla 16 Feb '25

16 Feb '25

Module: kamailio Branch: master Commit: 413c90202975886f4dfcb579a1157a19c3065341 URL: https://github.com/kamailio/kamailio/commit/413c90202975886f4dfcb579a1157a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-16T10:36:57+01:00 core: socket info - print index values in error message for overflow --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/413c90202975886f4dfcb579a1157a1… Patch: https://github.com/kamailio/kamailio/commit/413c90202975886f4dfcb579a1157a1… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 4fd44fec2dc..dac3f08a6e6 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1453,22 +1453,22 @@ static int get_flags(int family) } while(1) { - if(sizeof(buf) <= nll) { - LM_ERR("netlink buffer overflow in get_flags"); - goto error; - } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); if(rtn <= 0) { LM_ERR("failed to receive data (%d/%d)\n", rtn, errno); goto error; } + if(nll >= sizeof(buf) - rtn) { + LM_ERR("netlink buffer overflow [%u/%d]\n", nll, rtn); + goto error; + } nlp = (struct nlmsghdr *)p; if(nlp->nlmsg_type == NLMSG_DONE) { LM_DBG("done\n"); break; } if(nlp->nlmsg_type == NLMSG_ERROR) { - LM_DBG("Error on message to netlink"); + LM_DBG("error on message to netlink"); break; } p += rtn;

1 0

git:master:6b7af1be: registrar: remove unnecessary condition
by Daniel-Constantin Mierla 16 Feb '25

16 Feb '25

Module: kamailio Branch: master Commit: 6b7af1beb7fdaaec1b5d069fdfff3e3af5ca43ca URL: https://github.com/kamailio/kamailio/commit/6b7af1beb7fdaaec1b5d069fdfff3e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-16T10:23:18+01:00 registrar: remove unnecessary condition --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/6b7af1beb7fdaaec1b5d069fdfff3e3… Patch: https://github.com/kamailio/kamailio/commit/6b7af1beb7fdaaec1b5d069fdfff3e3… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 1709868f8e6..5ec02909ba6 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -955,8 +955,6 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) return -1; } } - if(u == NULL) - goto error; rerrno = R_FINE; ret = 1;

1 0

git:master:bf0cb8dd: ims_auth: restructured function to avoid unnecessary condition
by Daniel-Constantin Mierla 16 Feb '25

16 Feb '25

Module: kamailio Branch: master Commit: bf0cb8dd85c38c00435bfe6591b4b39b717b743c URL: https://github.com/kamailio/kamailio/commit/bf0cb8dd85c38c00435bfe6591b4b39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-16T10:19:53+01:00 ims_auth: restructured function to avoid unnecessary condition --- Modified: src/modules/ims_auth/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/bf0cb8dd85c38c00435bfe6591b4b39… Patch: https://github.com/kamailio/kamailio/commit/bf0cb8dd85c38c00435bfe6591b4b39… --- diff --git a/src/modules/ims_auth/authorize.c b/src/modules/ims_auth/authorize.c index 0d16e658893..6fa9937cb68 100644 --- a/src/modules/ims_auth/authorize.c +++ b/src/modules/ims_auth/authorize.c @@ -1999,17 +1999,14 @@ int drop_auth_vectors(str private_identity, str public_identity) { auth_userdata *aud; aud = get_auth_userdata(private_identity, public_identity); - if(!aud) - goto error; + if(!aud) { + LM_DBG("no authdata to drop any auth vectors\n"); + return 0; + } drop_auth_vectors_for_userdata(aud); auth_data_unlock(aud->hash); return 1; -error: - LM_DBG("no authdata to drop any auth vectors\n"); - if(aud) - auth_data_unlock(aud->hash); - return 0; } void drop_auth_vectors_for_userdata(auth_userdata *aud)

1 0

git:master:aae4cb32: db_redis: clean the keyname variable
by Daniel-Constantin Mierla 15 Feb '25

15 Feb '25

Module: kamailio Branch: master Commit: aae4cb323d4ea9d07b4b8aec61a6c9bc03e2ab83 URL: https://github.com/kamailio/kamailio/commit/aae4cb323d4ea9d07b4b8aec61a6c9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-15T15:28:35+01:00 db_redis: clean the keyname variable --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/aae4cb323d4ea9d07b4b8aec61a6c9b… Patch: https://github.com/kamailio/kamailio/commit/aae4cb323d4ea9d07b4b8aec61a6c9b… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 7f1d5720bd6..ac8b40756ec 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -616,7 +616,10 @@ static int db_redis_build_type_keys(km_redis_con_t *con, const str *table_name, if(set_keys) { // add key for parent set // <version>:<table>::index::<type> - pkg_free(keyname.s); + if(keyname.s) { + pkg_free(keyname.s); + keyname.s = NULL; + } keyname.len = table->version_code.len + table_name->len + 9 + type->type.len; keyname.s = pkg_malloc(keyname.len + 1); @@ -630,12 +633,16 @@ static int db_redis_build_type_keys(km_redis_con_t *con, const str *table_name, type->type.s); if(db_redis_key_add_str(set_keys, &keyname) != 0) { LM_ERR("Failed to add query key to set key list\n"); + pkg_free(keyname.s); + keyname.s = NULL; goto err; } } } - if(keyname.s) + if(keyname.s) { pkg_free(keyname.s); + keyname.s = NULL; + } } return 0;

1 0

git:master:d029de63: tsilo: free duplicated ruri and contact on error cases
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: d029de6380f8e30e0c82435b820744c21a5fbc78 URL: https://github.com/kamailio/kamailio/commit/d029de6380f8e30e0c82435b820744c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 tsilo: free duplicated ruri and contact on error cases --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/d029de6380f8e30e0c82435b820744c… Patch: https://github.com/kamailio/kamailio/commit/d029de6380f8e30e0c82435b820744c… --- diff --git a/src/modules/tsilo/tsilo.c b/src/modules/tsilo/tsilo.c index 6af49d59dd3..4e3c3501359 100644 --- a/src/modules/tsilo/tsilo.c +++ b/src/modules/tsilo/tsilo.c @@ -642,27 +642,33 @@ static int w_ts_append_by_contact3( if(ts_check_uri(&ruri) < 0) { LM_ERR("failed to parse R-URI.\n"); + pkg_free(ruri.s); return -1; } /* parse Contact header */ if(fixup_get_svalue(_msg, (gparam_t *)_contact, &contact_fixed) != 0) { LM_ERR("failed to convert contact parameter\n"); + pkg_free(ruri.s); return -1; } if(contact_fixed.s == NULL || contact_fixed.len <= 0) { LM_ERR("invalid contact parameter value\n"); + pkg_free(ruri.s); return -1; } if(pkg_str_dup(&contact, &contact_fixed) < 0) { LM_ERR("failed to copy r-uri parameter\n"); + pkg_free(ruri.s); return -1; } if(ts_check_uri(&contact) < 0) { LM_ERR("failed to parse Contact parameter.\n"); + pkg_free(ruri.s); + pkg_free(contact.s); return -1; } @@ -687,16 +693,22 @@ static int ki_ts_append_by_contact_uri( int rc; /* parse R-URI */ - if(ts_check_uri(_ruri) < 0) + if(ts_check_uri(_ruri) < 0) { return -1; - if(pkg_str_dup(&ruri, _ruri) < 0) + } + if(pkg_str_dup(&ruri, _ruri) < 0) { return -1; + } /* parse Contact header */ - if(ts_check_uri(_contact) < 0) + if(ts_check_uri(_contact) < 0) { + pkg_free(ruri.s); return -1; - if(pkg_str_dup(&contact, _contact) < 0) + } + if(pkg_str_dup(&contact, _contact) < 0) { + pkg_free(ruri.s); return -1; + } /* contact must be of syntax: sip:<user>@<host>:<port> with no parameters list */ rc = ts_append(_msg, &ruri, &contact, _table->s);

1 0

git:master:6a2a8255: dlgs: return -1 for 0 tags count
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 6a2a82555ee8bbfaca1e825c19d1532f22c2c629 URL: https://github.com/kamailio/kamailio/commit/6a2a82555ee8bbfaca1e825c19d1532… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 dlgs: return -1 for 0 tags count --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6a2a82555ee8bbfaca1e825c19d1532… Patch: https://github.com/kamailio/kamailio/commit/6a2a82555ee8bbfaca1e825c19d1532… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index f06c9d0ceaa..041356cedb1 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -341,7 +341,7 @@ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) int ret; ret = dlgs_tags_count(msg, vtags); - return (ret <= 0) ? (ret - 1) : ret; + return (ret == 0 || ret == -1) ? (ret - 1) : ret; } /**

1 0

git:master:39ba53a2: http_client: free dumplicated name in case of errors
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 39ba53a2499dd1f0e080bb011d7438a60ea5faec URL: https://github.com/kamailio/kamailio/commit/39ba53a2499dd1f0e080bb011d7438a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 http_client: free dumplicated name in case of errors --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/39ba53a2499dd1f0e080bb011d7438a… Patch: https://github.com/kamailio/kamailio/commit/39ba53a2499dd1f0e080bb011d7438a… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index 16dfb6cc09b..3582ecde199 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -582,21 +582,29 @@ int curl_parse_conn(void *param, cfg_parser_t *parser, unsigned int flags) t.start.line, t.start.col); return -1; } - pkg_str_dup(&name, &t.val); + if(pkg_str_dup(&name, &t.val) < 0) { + return -1; + } ret = cfg_get_token(&t, parser, 0); - if(ret < 0) + if(ret < 0) { + pkg_free(name.s); return -1; + } if((ret > 0) || (t.type != ']')) { LM_ERR("%s:%d:%d: Syntax error, ']' expected\n", parser->file, t.start.line, t.start.col); + pkg_free(name.s); return -1; } - if(cfg_eat_eol(parser, flags)) + if(cfg_eat_eol(parser, flags)) { + pkg_free(name.s); return -1; + } raw_cc = pkg_malloc(sizeof(raw_http_client_conn_t)); if(raw_cc == NULL) { + pkg_free(name.s); return -1; } memset(raw_cc, 0, sizeof(raw_http_client_conn_t));

1 0

git:master:8a96379c: call_control: free pv field in case of error
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 8a96379cc1ef7aa42bc4be49834c538a3bffdf14 URL: https://github.com/kamailio/kamailio/commit/8a96379cc1ef7aa42bc4be49834c538… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 call_control: free pv field in case of error --- Modified: src/modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/8a96379cc1ef7aa42bc4be49834c538… Patch: https://github.com/kamailio/kamailio/commit/8a96379cc1ef7aa42bc4be49834c538… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index fd1bf0736fc..83febe1f5b1 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -290,6 +290,9 @@ int cc_parse_param(void *val, AVP_List **avps) if(!(mp->next)) { PKG_MEM_ERROR; pkg_free(p0); + if(mp->pv) { + pkg_free(mp->pv); + } pkg_free(mp); return -1; }

1 0

git:master:34743f40: sdpops: check the limit for computed rtcp port
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 34743f40056e230e6c6d1ae6bf72e369b6f6890f URL: https://github.com/kamailio/kamailio/commit/34743f40056e230e6c6d1ae6bf72e36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 sdpops: check the limit for computed rtcp port --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/34743f40056e230e6c6d1ae6bf72e36… Patch: https://github.com/kamailio/kamailio/commit/34743f40056e230e6c6d1ae6bf72e36… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 164b97f1ba3..7631779c70f 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -25,6 +25,7 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <limits.h> #include "../../core/sr_module.h" #include "../../core/dprint.h" @@ -2212,7 +2213,10 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } if(sdp->sessions->streams->port.s != NULL && sdp->sessions->streams->port.len > 0) { - str2int(&sdp->sessions->streams->port, &uport); + if(str2int(&sdp->sessions->streams->port, &uport) < 0 + || uport >= USHRT_MAX) { + return pv_get_null(msg, param, res); + } uport++; s.s = int2strbuf(uport, uport_buf, INT2STR_MAX_LEN, &s.len); return pv_get_strval(msg, param, res, &s);

1 0

git:master:01782191: sca: free replaces hdr on anchor lump failure
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 01782191418f3d65c4aa5cb273140fec928d153a URL: https://github.com/kamailio/kamailio/commit/01782191418f3d65c4aa5cb273140fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 sca: free replaces hdr on anchor lump failure --- Modified: src/modules/sca/sca_call_info.c --- Diff: https://github.com/kamailio/kamailio/commit/01782191418f3d65c4aa5cb273140fe… Patch: https://github.com/kamailio/kamailio/commit/01782191418f3d65c4aa5cb273140fe… --- diff --git a/src/modules/sca/sca_call_info.c b/src/modules/sca/sca_call_info.c index b15a7251746..3d5471178c0 100644 --- a/src/modules/sca/sca_call_info.c +++ b/src/modules/sca/sca_call_info.c @@ -615,6 +615,7 @@ int sca_call_info_seize_held_call(sip_msg_t *msg, sca_call_info *call_info, anchor = anchor_lump(msg, msg->eoh - msg->buf, 0, HDR_OTHER_T); if(anchor == NULL) { LM_ERR("Failed to anchor lump\n"); + pkg_free(replaces_hdr.s); goto done; } @@ -638,7 +639,6 @@ int sca_call_info_seize_held_call(sip_msg_t *msg, sca_call_info *call_info, // we restore the original owner and dialog. if(sca_appearance_update_owner_unsafe(app, contact_uri) < 0) { LM_ERR("sca_call_info_seize_held_call: failed to update owner\n"); - pkg_free(replaces_hdr.s); goto done; }

1 0

[kamailio/kamailio] ims_auth|ims_registrar_pcscf: Fix Build for CentOS 7 (PR #4145)
by Gustavo Almeida 14 Feb '25

14 Feb '25

### Description At this time, it's not possible to build Kamailio on `CentOS 7` on `master` or `6.0.0`. Some code on `ims_auth` and `ims_registrar_pcscf` is not compliant with old `gcc`. #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Additional Information Tested on my own, and build now works just fine. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4145 -- Commit Summary -- * ims_auth: Fix CentOS 7 Build * ims_auth: Fix CentOS 7 Build * ims_registrar_pcscf: Fix CentOS 7 Build * Merge branch 'master' into bundasmanu/fix_centos_7_build -- File Changes -- M src/modules/ims_auth/auth_vector.c (11) M src/modules/ims_registrar_pcscf/subscribe.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4145.patch https://github.com/kamailio/kamailio/pull/4145.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4145 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4145(a)github.com>

2 2

git:master:e458ca15: ims_registrar_pcscf: Fix CentOS 7 Build
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: e458ca15a4ca30448ea9aae20a93eb86e2ce92c0 URL: https://github.com/kamailio/kamailio/commit/e458ca15a4ca30448ea9aae20a93eb8… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:39:50+01:00 ims_registrar_pcscf: Fix CentOS 7 Build - ims_registrar_pcscf: Fix non C99 compliant code --- Modified: src/modules/ims_registrar_pcscf/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/e458ca15a4ca30448ea9aae20a93eb8… Patch: https://github.com/kamailio/kamailio/commit/e458ca15a4ca30448ea9aae20a93eb8… --- diff --git a/src/modules/ims_registrar_pcscf/subscribe.c b/src/modules/ims_registrar_pcscf/subscribe.c index c507b6d272d..9259704eb10 100644 --- a/src/modules/ims_registrar_pcscf/subscribe.c +++ b/src/modules/ims_registrar_pcscf/subscribe.c @@ -56,12 +56,13 @@ int reginfo_subscribe_real(struct sip_msg *msg, pv_elem_t *uri, str extra_headers = {0}; reginfo_event_t *new_event; str *subs_outbound_proxy = 0; + int i = 0; int len = strlen(P_ASSERTED_IDENTITY_HDR_PREFIX) + pcscf_uri.len + 1 + CRLF_LEN; if(service_routes != NULL) { len += strlen(ROUTE_HDR_PREFIX) + strlen(ROUTE_HDR_END); - for(int i = 0; i < num_service_routes; i++) { + for(i = 0; i < num_service_routes; i++) { len += service_routes[i].len + strlen(ROUTE_HDR_SEPARATOR); } } @@ -87,7 +88,7 @@ int reginfo_subscribe_real(struct sip_msg *msg, pv_elem_t *uri, memcpy(extra_headers.s + extra_headers.len, ROUTE_HDR_PREFIX, strlen(ROUTE_HDR_PREFIX)); extra_headers.len += strlen(ROUTE_HDR_PREFIX); - for(int i = 0; i < num_service_routes; i++) { + for(i = 0; i < num_service_routes; i++) { memcpy(extra_headers.s + extra_headers.len, service_routes[i].s, service_routes[i].len); extra_headers.len += service_routes[i].len;

1 0

git:master:7a65b3ce: ims_auth: Fix CentOS 7 Build
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 7a65b3ce11a3afc0f5be47f61235166cb8938c78 URL: https://github.com/kamailio/kamailio/commit/7a65b3ce11a3afc0f5be47f61235166… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:39:50+01:00 ims_auth: Fix CentOS 7 Build - ims_auth: Fix non C99 compliant code --- Modified: src/modules/ims_auth/auth_vector.c --- Diff: https://github.com/kamailio/kamailio/commit/7a65b3ce11a3afc0f5be47f61235166… Patch: https://github.com/kamailio/kamailio/commit/7a65b3ce11a3afc0f5be47f61235166… --- diff --git a/src/modules/ims_auth/auth_vector.c b/src/modules/ims_auth/auth_vector.c index 19fbad91409..26acf36a8da 100644 --- a/src/modules/ims_auth/auth_vector.c +++ b/src/modules/ims_auth/auth_vector.c @@ -40,6 +40,8 @@ auth_vector *auth_vector_make_local(uint8_t k[16], uint8_t op[16], int opIsOPc, uint8_t ak[6]; uint8_t authenticate[16 + 6 + 2 + 8]; + int i = 0; + // f0 - generate random f0(rand); @@ -58,7 +60,7 @@ auth_vector *auth_vector_make_local(uint8_t k[16], uint8_t op[16], int opIsOPc, // AUTN = SQN ^ AK || AMF || MAC-A // Authenticate = RAND || AUTN memcpy(authenticate, rand, 16); - for(int i = 0; i < 6; i++) + for(i = 0; i < 6; i++) authenticate[16 + i] = sqn[i] ^ ak[i]; memcpy(authenticate + 22, amf, 2); memcpy(authenticate + 24, mac_a, 8); @@ -90,6 +92,8 @@ int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, uint8_t mac_s[8]; uint8_t xmac_s[8]; + int i = 0; + if(!av->is_locally_generated) { LM_ERR("auth_vector is not locally generated - let the HSS handle " "resync\n"); @@ -114,7 +118,6 @@ int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, f5star(ak, k, op_c, rand); // Unpack the AUTS = (SQN_MS ^ AK) || MAC-S - int i = 0; for(i = 0; i < 6; i++) sqnMS[i] = auts[i] ^ ak[i]; memcpy(mac_s, auts + 6, 8);

1 0

git:master:2349e408: ims_auth: Fix CentOS 7 Build
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 2349e4088d3fd454b74de15dfcb9a3e19fc03663 URL: https://github.com/kamailio/kamailio/commit/2349e4088d3fd454b74de15dfcb9a3e… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:39:50+01:00 ims_auth: Fix CentOS 7 Build ims_auth: Fix non C99 compliant code --- Modified: src/modules/ims_auth/auth_vector.c --- Diff: https://github.com/kamailio/kamailio/commit/2349e4088d3fd454b74de15dfcb9a3e… Patch: https://github.com/kamailio/kamailio/commit/2349e4088d3fd454b74de15dfcb9a3e… --- diff --git a/src/modules/ims_auth/auth_vector.c b/src/modules/ims_auth/auth_vector.c index a681490f71a..19fbad91409 100644 --- a/src/modules/ims_auth/auth_vector.c +++ b/src/modules/ims_auth/auth_vector.c @@ -114,7 +114,8 @@ int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, f5star(ak, k, op_c, rand); // Unpack the AUTS = (SQN_MS ^ AK) || MAC-S - for(int i = 0; i < 6; i++) + int i = 0; + for(i = 0; i < 6; i++) sqnMS[i] = auts[i] ^ ak[i]; memcpy(mac_s, auts + 6, 8); @@ -135,7 +136,8 @@ int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, void sqn_increment(uint8_t sqn[6]) { - for(int i = 5; i >= 0; i--) { + int i = 0; + for(i = 5; i >= 0; i--) { if(sqn[i] == 0xFF) { sqn[i] = 0; } else {

1 0

git:master:e65b03cd: xmlrpc: removed unnecessary code
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: e65b03cdd946d735a3ef33ae3582bcfad464d2c7 URL: https://github.com/kamailio/kamailio/commit/e65b03cdd946d735a3ef33ae3582bcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T10:16:00+01:00 xmlrpc: removed unnecessary code --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/e65b03cdd946d735a3ef33ae3582bcf… Patch: https://github.com/kamailio/kamailio/commit/e65b03cdd946d735a3ef33ae3582bcf… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index eb44f4450dd..24a0c375a54 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -2091,9 +2091,7 @@ static int rpc_struct_printf( goto err; } } - if(buf) - mxr_free(buf); - return 0; + err: if(buf) mxr_free(buf);

1 0

git:master:edbb5b11: ctl: refactored error handling and removed unnecessary code
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: edbb5b11e9453be3519e6e9a945937307c95709e URL: https://github.com/kamailio/kamailio/commit/edbb5b11e9453be3519e6e9a9459373… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T08:37:23+01:00 ctl: refactored error handling and removed unnecessary code --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/edbb5b11e9453be3519e6e9a9459373… Patch: https://github.com/kamailio/kamailio/commit/edbb5b11e9453be3519e6e9a9459373… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index 70ce92deb76..2d671798cce 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -1290,7 +1290,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) &nm, 1); /* Escape all characters, including : and , */ if(!m) { rpc_fault(ctx, 500, "Internal Server Error"); - goto err; + goto error; } s.s = buf; @@ -1300,7 +1300,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) rpc_fault(ctx, 500, "Internal Server Error"); free_chunk(m); ERR("Error while creating text_chunk structure"); - goto err; + goto error; } l->flags |= CHUNK_MEMBER_VALUE; @@ -1326,13 +1326,12 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) if((buf0 = ctl_realloc(buf, buf_size)) == 0) { rpc_fault(ctx, 500, "Internal Server Error (No memory left)"); ERR("No memory left\n"); - goto err; + goto error; } buf = buf0; } - ctl_free(buf); - return 0; -err: + +error: if(buf) ctl_free(buf); return -1;

1 0

git:master:a6d692be: pv: free buf uri in case of error setting xto attr
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: a6d692be4283dc349c38b455ee71c4e21dcef6aa URL: https://github.com/kamailio/kamailio/commit/a6d692be4283dc349c38b455ee71c4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T11:58:21+01:00 pv: free buf uri in case of error setting xto attr --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/a6d692be4283dc349c38b455ee71c4e… Patch: https://github.com/kamailio/kamailio/commit/a6d692be4283dc349c38b455ee71c4e… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 38d46c01dba..56d96b20d75 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3817,6 +3817,9 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return 0; error: + if(buf_uri.s != 0) { + pkg_free(buf_uri.s); + } if(buf.s != NULL) { pkg_free(buf.s); }

1 0

git:master:b875e736: pv: free next field on error when parsing xav* names
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: b875e7368dcc8e221007caafa3599c3e354404f7 URL: https://github.com/kamailio/kamailio/commit/b875e7368dcc8e221007caafa3599c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T11:45:06+01:00 pv: free next field on error when parsing xav* names --- Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/b875e7368dcc8e221007caafa3599c3… Patch: https://github.com/kamailio/kamailio/commit/b875e7368dcc8e221007caafa3599c3… --- diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 89d9ba131d0..8858c376367 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -516,6 +516,10 @@ int pv_parse_xavp_name(pv_spec_p sp, str *in) error: if(xname != NULL) { + if(xname->next != NULL) { + pkg_free(xname->next); + xname->next = NULL; + } pv_xavp_name_destroy(xname); pkg_free(xname); } @@ -964,6 +968,10 @@ int pv_parse_xavu_name(pv_spec_t *sp, str *in) error: if(xname != NULL) { + if(xname->next != NULL) { + pkg_free(xname->next); + xname->next = NULL; + } pv_xavu_name_destroy(xname); pkg_free(xname); } @@ -1111,6 +1119,10 @@ int pv_parse_xavi_name(pv_spec_p sp, str *in) error: if(xname != NULL) { + if(xname->next != NULL) { + pkg_free(xname->next); + xname->next = NULL; + } pv_xavi_name_destroy(xname); pkg_free(xname); }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev