sr-dev

sr-dev@lists.kamailio.org

44307 discussions

[tracker] Task changed: tm clone msg / free_faked_req bug

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#37 - tm clone msg / free_faked_req bug User who did this: Andrei Pelinescu-Onciul (andrei) Percent Complete: 50% -> 90% Status: Assigned -> Requires testing More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=37 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 11 months

[tracker] Comment added: tm clone msg / free_faked_req bug

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#37 - tm clone msg / free_faked_req bug User who did this - Andrei Pelinescu-Onciul (andrei) ---------- It should be fixed now, could you please re-test? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=37#comment28 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 11 months

git:kamailio_3.0: core: avoid non-null 0-length dst_uri, ruris and path

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: 832a6bf53562ca492ecbbee86b5445ffee00c883 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=832a6bf… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 20:46:47 2010 +0100 core: avoid non-null 0-length dst_uri, ruris and path - a dst_uri or ruri that has 0 length should be equivalent to also having a null corresponding char* pointer. sip_msg_shm_clone() will now clone this type of uris to (0,0). - set_dst_uri() called with "" (a 0-length non-zero string) is now equivalent to reset_dst_uri(). - set_path_vector() called with "" is now equivalent with reset_path_vector(). (cherry picked from commit feb3478b19452fe096f33364e6a59ec57c93efbe) --- parser/msg_parser.c | 12 ++++++++---- sip_msg_clone.c | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 48f666c..0c56211 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -736,12 +736,14 @@ int set_dst_uri(struct sip_msg* msg, str* uri) { char* ptr; - if (!msg || !uri) { + if (unlikely(!msg || !uri)) { LOG(L_ERR, "set_dst_uri: Invalid parameter value\n"); return -1; } - if (msg->dst_uri.s && (msg->dst_uri.len >= uri->len)) { + if (unlikely(uri->len == 0)) { + reset_dst_uri(msg); + }else if (msg->dst_uri.s && (msg->dst_uri.len >= uri->len)) { memcpy(msg->dst_uri.s, uri->s, uri->len); msg->dst_uri.len = uri->len; } else { @@ -773,12 +775,14 @@ int set_path_vector(struct sip_msg* msg, str* path) { char* ptr; - if (!msg || !path) { + if (unlikely(!msg || !path)) { LM_ERR("invalid parameter value\n"); return -1; } - if (msg->path_vec.s && (msg->path_vec.len >= path->len)) { + if (unlikely(path->len == 0)) { + reset_path_vector(msg); + } else if (msg->path_vec.s && (msg->path_vec.len >= path->len)) { memcpy(msg->path_vec.s, path->s, path->len); msg->path_vec.len = path->len; } else { diff --git a/sip_msg_clone.c b/sip_msg_clone.c index 979e46f..7308942 100644 --- a/sip_msg_clone.c +++ b/sip_msg_clone.c @@ -513,6 +513,9 @@ struct sip_msg* sip_msg_shm_clone( struct sip_msg *org_msg, int *sip_msg_len, new_msg->add_rm = 0; new_msg->body_lumps = 0; new_msg->reply_lump = 0; + /* zero *uri.s, in case len is 0 but org_msg->*uris!=0 (just to be safe)*/ + new_msg->new_uri.s = 0; + new_msg->dst_uri.s = 0; /* new_uri */ if (org_msg->new_uri.s && org_msg->new_uri.len) {

14 years, 11 months

git:kamailio_3.0: tm: fake_req dst_uri and ruri copy fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: 4834519a39a406b73adf5e9c1bca3c6d2fd1e5f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4834519… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 20:40:46 2010 +0100 tm: fake_req dst_uri and ruri copy fix If the uris have 0 len but no 0 value (possible at least for a manually set dst_uri), set the corresponding fake_req uri to 0, thus avoiding a potentially disastrous free in free_faked_req(). Should close FS#37. (cherry picked from commit 583d213cb617e767f5895de18168d7516e51e5e6) --- modules/tm/t_reply.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 9166c18..7c5c78e 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -784,6 +784,9 @@ int fake_req(struct sip_msg *faked_req, memcpy( faked_req->dst_uri.s, shmem_msg->dst_uri.s, faked_req->dst_uri.len); faked_req->dst_uri.s[faked_req->dst_uri.len]=0; + }else{ + /* in case len==0, but shmem_msg->dst_uri.s!=0 (extra safety) */ + faked_req->dst_uri.s = 0; } /* new_uri can change -- make a private copy */ if (shmem_msg->new_uri.s!=0 && shmem_msg->new_uri.len!=0) { @@ -796,6 +799,9 @@ int fake_req(struct sip_msg *faked_req, memcpy( faked_req->new_uri.s, shmem_msg->new_uri.s, faked_req->new_uri.len); faked_req->new_uri.s[faked_req->new_uri.len]=0; + }else{ + /* in case len==0, but shmem_msg->new_uri.s!=0 (extra safety)*/ + faked_req->new_uri.s = 0; } if(uac) setbflagsval(0, uac->branch_flags); else setbflagsval(0, 0);

14 years, 11 months

git:sr_3.0: tm: fake_req dst_uri and ruri copy fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 583d213cb617e767f5895de18168d7516e51e5e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=583d213… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 20:40:46 2010 +0100 tm: fake_req dst_uri and ruri copy fix If the uris have 0 len but no 0 value (possible at least for a manually set dst_uri), set the corresponding fake_req uri to 0, thus avoiding a potentially disastrous free in free_faked_req(). Should close FS#37. --- modules/tm/t_reply.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 02b03e5..ff89dd4 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -772,6 +772,9 @@ int fake_req(struct sip_msg *faked_req, memcpy( faked_req->dst_uri.s, shmem_msg->dst_uri.s, faked_req->dst_uri.len); faked_req->dst_uri.s[faked_req->dst_uri.len]=0; + }else{ + /* in case len==0, but shmem_msg->dst_uri.s!=0 (extra safety) */ + faked_req->dst_uri.s = 0; } /* new_uri can change -- make a private copy */ if (shmem_msg->new_uri.s!=0 && shmem_msg->new_uri.len!=0) { @@ -784,6 +787,9 @@ int fake_req(struct sip_msg *faked_req, memcpy( faked_req->new_uri.s, shmem_msg->new_uri.s, faked_req->new_uri.len); faked_req->new_uri.s[faked_req->new_uri.len]=0; + }else{ + /* in case len==0, but shmem_msg->new_uri.s!=0 (extra safety)*/ + faked_req->new_uri.s = 0; } if(uac) setbflagsval(0, uac->branch_flags); else setbflagsval(0, 0);

14 years, 11 months

git:sr_3.0: core: avoid non-null 0-length dst_uri, ruris and path

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: feb3478b19452fe096f33364e6a59ec57c93efbe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=feb3478… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 20:46:47 2010 +0100 core: avoid non-null 0-length dst_uri, ruris and path - a dst_uri or ruri that has 0 length should be equivalent to also having a null corresponding char* pointer. sip_msg_shm_clone() will now clone this type of uris to (0,0). - set_dst_uri() called with "" (a 0-length non-zero string) is now equivalent to reset_dst_uri(). - set_path_vector() called with "" is now equivalent with reset_path_vector(). --- parser/msg_parser.c | 12 ++++++++---- sip_msg_clone.c | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 1cb530c..41bb841 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -736,12 +736,14 @@ int set_dst_uri(struct sip_msg* msg, str* uri) { char* ptr; - if (!msg || !uri) { + if (unlikely(!msg || !uri)) { LOG(L_ERR, "set_dst_uri: Invalid parameter value\n"); return -1; } - if (msg->dst_uri.s && (msg->dst_uri.len >= uri->len)) { + if (unlikely(uri->len == 0)) { + reset_dst_uri(msg); + }else if (msg->dst_uri.s && (msg->dst_uri.len >= uri->len)) { memcpy(msg->dst_uri.s, uri->s, uri->len); msg->dst_uri.len = uri->len; } else { @@ -773,12 +775,14 @@ int set_path_vector(struct sip_msg* msg, str* path) { char* ptr; - if (!msg || !path) { + if (unlikely(!msg || !path)) { LM_ERR("invalid parameter value\n"); return -1; } - if (msg->path_vec.s && (msg->path_vec.len >= path->len)) { + if (unlikely(path->len == 0)) { + reset_path_vector(msg); + } else if (msg->path_vec.s && (msg->path_vec.len >= path->len)) { memcpy(msg->path_vec.s, path->s, path->len); msg->path_vec.len = path->len; } else { diff --git a/sip_msg_clone.c b/sip_msg_clone.c index 979e46f..7308942 100644 --- a/sip_msg_clone.c +++ b/sip_msg_clone.c @@ -513,6 +513,9 @@ struct sip_msg* sip_msg_shm_clone( struct sip_msg *org_msg, int *sip_msg_len, new_msg->add_rm = 0; new_msg->body_lumps = 0; new_msg->reply_lump = 0; + /* zero *uri.s, in case len is 0 but org_msg->*uris!=0 (just to be safe)*/ + new_msg->new_uri.s = 0; + new_msg->dst_uri.s = 0; /* new_uri */ if (org_msg->new_uri.s && org_msg->new_uri.len) {

14 years, 11 months

[tracker] Comment added: tm clone msg / free_faked_req bug

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#37 - tm clone msg / free_faked_req bug User who did this - Andrei Pelinescu-Onciul (andrei) ---------- Thanks a lot for the very detailed report (those 60MBs helped a lot :-)). The bug looks to be tm clone_msg / set_dst_uri related. Are you by chance setting dst_uri somewhere in the script prior to t_relay/t_new to ""? How do you add the branch? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=37#comment27 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 11 months

[tracker] Task changed: tm clone msg / free_faked_req bug

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#37 - tm clone msg / free_faked_req bug User who did this: Andrei Pelinescu-Onciul (andrei) Summary: memory manager bug? -> tm clone msg / free_faked_req bug Percent Complete: 0% -> 50% Category: Core -> tm Due in Version: [-] -> 3.0 Severity: Low -> High More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=37 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 11 months

git:andrei/cdefs2doc: doc: rpc_list: docbook output directory

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/cdefs2doc Commit: b6cfcc7091eacc62f602beb41075436e09b6ad37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6cfcc7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 17:24:46 2010 +0100 doc: rpc_list: docbook output directory Added directory for docbook output, complete with standard doc makefile (for generating html, pdf, txt a.s.o from docbook sources). --- doc/rpc_list/docbook/Makefile | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/doc/rpc_list/docbook/Makefile b/doc/rpc_list/docbook/Makefile new file mode 100644 index 0000000..c76cc9f --- /dev/null +++ b/doc/rpc_list/docbook/Makefile @@ -0,0 +1,5 @@ + +docs = rpc_list.xml +docbook_dir = ../../../docbook + +include $(docbook_dir)/Makefile

14 years, 11 months

git:andrei/cdefs2doc: doc: rpc_list: generated docbook rpc lists

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/cdefs2doc Commit: 2b354470a3bd73db16c75d6a17f2ad205339c7fb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b35447… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 17:38:05 2010 +0100 doc: rpc_list: generated docbook rpc lists --- doc/rpc_list/docbook/rpc_cfg_rpc.xml | 96 +++++++++ doc/rpc_list/docbook/rpc_core.xml | 331 +++++++++++++++++++++++++++++ doc/rpc_list/docbook/rpc_cpl-c.xml | 35 +++ doc/rpc_list/docbook/rpc_ctl.xml | 35 +++ doc/rpc_list/docbook/rpc_db_flatstore.xml | 19 ++ doc/rpc_list/docbook/rpc_dispatcher.xml | 27 +++ doc/rpc_list/docbook/rpc_domain.xml | 27 +++ doc/rpc_list/docbook/rpc_gflags.xml | 59 +++++ doc/rpc_list/docbook/rpc_lcr.xml | 35 +++ doc/rpc_list/docbook/rpc_list.xml | 34 +++ doc/rpc_list/docbook/rpc_mi_rpc.xml | 47 ++++ doc/rpc_list/docbook/rpc_pdt.xml | 36 +++ doc/rpc_list/docbook/rpc_pike.xml | 19 ++ doc/rpc_list/docbook/rpc_prefix_route.xml | 27 +++ doc/rpc_list/docbook/rpc_presence_b2b.xml | 27 +++ doc/rpc_list/docbook/rpc_ratelimit.xml | 51 +++++ doc/rpc_list/docbook/rpc_rls.xml | 19 ++ doc/rpc_list/docbook/rpc_sl.xml | 19 ++ doc/rpc_list/docbook/rpc_tls.xml | 28 +++ doc/rpc_list/docbook/rpc_tm.xml | 60 ++++++ doc/rpc_list/docbook/rpc_usrloc.xml | 77 +++++++ 21 files changed, 1108 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2b3…

14 years, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev