sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
226 discussions

git:kamailio_3.0: dialplan: use size_t to get the size of compiled pcre

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: d2729211fc9c50acf13f11ce533687164fea0458 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d272921… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 2 16:00:13 2011 +0100 dialplan: use size_t to get the size of compiled pcre - it caused crash on 64b since size was declared as int and pcre_fullinfo() expects size_t (on 32b is the same struct size) - reported by Javier Gallart and Bayan Towfiq - credits to Bayan for provinding testing environment and troubleshooting assistance, closes FS#109 (cherry picked from commit 12aebbf1056a3b51e349de6e69e2aca1801905a3) --- modules/dialplan/dp_db.c | 65 +++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 32 deletions(-) diff --git a/modules/dialplan/dp_db.c b/modules/dialplan/dp_db.c index 262e552..97c07ba 100644 --- a/modules/dialplan/dp_db.c +++ b/modules/dialplan/dp_db.c @@ -303,39 +303,40 @@ int str_to_shm(str src, str * dest) /* Compile pcre pattern and return pointer to shm copy of result */ static pcre *reg_ex_comp(const char *pattern, int *cap_cnt) { - pcre *re, *result; - const char *error; - int rc, size, err_offset; - - re = pcre_compile(pattern, 0, &error, &err_offset, NULL); - if (re == NULL) { - LM_ERR("PCRE compilation of '%s' failed at offset %d: %s\n", - pattern, err_offset, error); - return (pcre *)0; - } - rc = pcre_fullinfo(re, NULL, PCRE_INFO_SIZE, &size); - if (rc != 0) { - pcre_free(re); - LM_ERR("pcre_fullinfo on compiled pattern '%s' yielded error: %d\n", - pattern, rc); - return (pcre *)0; - } - rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, cap_cnt); - if (rc != 0) { - pcre_free(re); - LM_ERR("pcre_fullinfo on compiled pattern '%s' yielded error: %d\n", - pattern, rc); - return (pcre *)0; - } - result = (pcre *)shm_malloc(size); - if (result == NULL) { + pcre *re, *result; + const char *error; + int rc, err_offset; + size_t size; + + re = pcre_compile(pattern, 0, &error, &err_offset, NULL); + if (re == NULL) { + LM_ERR("PCRE compilation of '%s' failed at offset %d: %s\n", + pattern, err_offset, error); + return (pcre *)0; + } + rc = pcre_fullinfo(re, NULL, PCRE_INFO_SIZE, &size); + if (rc != 0) { + pcre_free(re); + LM_ERR("pcre_fullinfo on compiled pattern '%s' yielded error: %d\n", + pattern, rc); + return (pcre *)0; + } + rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, cap_cnt); + if (rc != 0) { + pcre_free(re); + LM_ERR("pcre_fullinfo on compiled pattern '%s' yielded error: %d\n", + pattern, rc); + return (pcre *)0; + } + result = (pcre *)shm_malloc(size); + if (result == NULL) { + pcre_free(re); + LM_ERR("not enough shared memory for compiled PCRE pattern\n"); + return (pcre *)0; + } + memcpy(result, re, size); pcre_free(re); - LM_ERR("not enough shared memory for compiled PCRE pattern\n"); - return (pcre *)0; - } - memcpy(result, re, size); - pcre_free(re); - return result; + return result; }

13 years, 10 months

git:3.1: dialplan: fix matching string comparison op

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 8d122fe2f57775079c17e68159e1a6d2001d6194 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d122fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 2 16:10:40 2011 +0100 dialplan: fix matching string comparison op - the return code was tested as for match of regexp, which led to mismatches for str comparison - credits to Jordan Levy (cherry picked from commit 88f03cb2cf50ee0b09fda8b3c4c4651553ddd176) --- modules/dialplan/dp_repl.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/dialplan/dp_repl.c b/modules/dialplan/dp_repl.c index 5831f36..f647122 100644 --- a/modules/dialplan/dp_repl.c +++ b/modules/dialplan/dp_repl.c @@ -312,21 +312,23 @@ search_rule: case EQUAL_OP: LM_DBG("equal operator testing\n"); - if(rulep->match_exp.len != input.len) + if(rulep->match_exp.len != input.len) { rez = -1; - else + } else { rez = strncmp(rulep->match_exp.s,input.s,input.len); - break; + rez = (rez==0)?0:-1; + } + break; default: - LM_ERR("bogus match operator code %i\n", rulep->matchop); + LM_ERR("bogus match operator code %i\n", rulep->matchop); return -1; } if(rez >= 0) - goto repl; + goto repl; } - /*test the rules with len 0*/ - if(indexp->len){ + /*test the rules with len 0*/ + if(indexp->len){ for(indexp = indexp->next; indexp!=NULL; indexp = indexp->next) if(!indexp->len) break;

13 years, 10 months

git:3.1: dialplan: use size_t to get the size of compiled pcre

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: bf6caa0d4bbe81b452d19b75801608408c694071 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf6caa0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 2 16:00:13 2011 +0100 dialplan: use size_t to get the size of compiled pcre - it caused crash on 64b since size was declared as int and pcre_fullinfo() expects size_t (on 32b is the same struct size) - reported by Javier Gallart and Bayan Towfiq - credits to Bayan for provinding testing environment and troubleshooting assistance, closes FS#109 (cherry picked from commit 12aebbf1056a3b51e349de6e69e2aca1801905a3) --- modules/dialplan/dp_db.c | 65 +++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 32 deletions(-) diff --git a/modules/dialplan/dp_db.c b/modules/dialplan/dp_db.c index 62a64e4..155b2a0 100644 --- a/modules/dialplan/dp_db.c +++ b/modules/dialplan/dp_db.c @@ -316,39 +316,40 @@ int str_to_shm(str src, str * dest) /* Compile pcre pattern and return pointer to shm copy of result */ static pcre *reg_ex_comp(const char *pattern, int *cap_cnt) { - pcre *re, *result; - const char *error; - int rc, size, err_offset; - - re = pcre_compile(pattern, 0, &error, &err_offset, NULL); - if (re == NULL) { - LM_ERR("PCRE compilation of '%s' failed at offset %d: %s\n", - pattern, err_offset, error); - return (pcre *)0; - } - rc = pcre_fullinfo(re, NULL, PCRE_INFO_SIZE, &size); - if (rc != 0) { - pcre_free(re); - LM_ERR("pcre_fullinfo on compiled pattern '%s' yielded error: %d\n", - pattern, rc); - return (pcre *)0; - } - rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, cap_cnt); - if (rc != 0) { - pcre_free(re); - LM_ERR("pcre_fullinfo on compiled pattern '%s' yielded error: %d\n", - pattern, rc); - return (pcre *)0; - } - result = (pcre *)shm_malloc(size); - if (result == NULL) { + pcre *re, *result; + const char *error; + int rc, err_offset; + size_t size; + + re = pcre_compile(pattern, 0, &error, &err_offset, NULL); + if (re == NULL) { + LM_ERR("PCRE compilation of '%s' failed at offset %d: %s\n", + pattern, err_offset, error); + return (pcre *)0; + } + rc = pcre_fullinfo(re, NULL, PCRE_INFO_SIZE, &size); + if (rc != 0) { + pcre_free(re); + LM_ERR("pcre_fullinfo on compiled pattern '%s' yielded error: %d\n", + pattern, rc); + return (pcre *)0; + } + rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, cap_cnt); + if (rc != 0) { + pcre_free(re); + LM_ERR("pcre_fullinfo on compiled pattern '%s' yielded error: %d\n", + pattern, rc); + return (pcre *)0; + } + result = (pcre *)shm_malloc(size); + if (result == NULL) { + pcre_free(re); + LM_ERR("not enough shared memory for compiled PCRE pattern\n"); + return (pcre *)0; + } + memcpy(result, re, size); pcre_free(re); - LM_ERR("not enough shared memory for compiled PCRE pattern\n"); - return (pcre *)0; - } - memcpy(result, re, size); - pcre_free(re); - return result; + return result; }

13 years, 10 months

git:master: dialplan: fix matching string comparison op

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 88f03cb2cf50ee0b09fda8b3c4c4651553ddd176 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88f03cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 2 16:10:40 2011 +0100 dialplan: fix matching string comparison op - the return code was tested as for match of regexp, which led to mismatches for str comparison - credits to Jordan Levy --- modules/dialplan/dp_repl.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/dialplan/dp_repl.c b/modules/dialplan/dp_repl.c index 2b8454c..265b507 100644 --- a/modules/dialplan/dp_repl.c +++ b/modules/dialplan/dp_repl.c @@ -316,21 +316,23 @@ search_rule: case EQUAL_OP: LM_DBG("equal operator testing\n"); - if(rulep->match_exp.len != input.len) + if(rulep->match_exp.len != input.len) { rez = -1; - else + } else { rez = strncmp(rulep->match_exp.s,input.s,input.len); - break; + rez = (rez==0)?0:-1; + } + break; default: - LM_ERR("bogus match operator code %i\n", rulep->matchop); + LM_ERR("bogus match operator code %i\n", rulep->matchop); return -1; } if(rez >= 0) - goto repl; + goto repl; } - /*test the rules with len 0*/ - if(indexp->len){ + /*test the rules with len 0*/ + if(indexp->len){ for(indexp = indexp->next; indexp!=NULL; indexp = indexp->next) if(!indexp->len) break;

13 years, 10 months

git:master: dialplan: use size_t to get the size of compiled pcre

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 12aebbf1056a3b51e349de6e69e2aca1801905a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12aebbf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 2 16:00:13 2011 +0100 dialplan: use size_t to get the size of compiled pcre - it caused crash on 64b since size was declared as int and pcre_fullinfo() expects size_t (on 32b is the same struct size) - reported by Javier Gallart and Bayan Towfiq - credits to Bayan for provinding testing environment and troubleshooting assistance, closes FS#109 --- modules/dialplan/dp_db.c | 65 +++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 32 deletions(-) diff --git a/modules/dialplan/dp_db.c b/modules/dialplan/dp_db.c index 62a64e4..155b2a0 100644 --- a/modules/dialplan/dp_db.c +++ b/modules/dialplan/dp_db.c @@ -316,39 +316,40 @@ int str_to_shm(str src, str * dest) /* Compile pcre pattern and return pointer to shm copy of result */ static pcre *reg_ex_comp(const char *pattern, int *cap_cnt) { - pcre *re, *result; - const char *error; - int rc, size, err_offset; - - re = pcre_compile(pattern, 0, &error, &err_offset, NULL); - if (re == NULL) { - LM_ERR("PCRE compilation of '%s' failed at offset %d: %s\n", - pattern, err_offset, error); - return (pcre *)0; - } - rc = pcre_fullinfo(re, NULL, PCRE_INFO_SIZE, &size); - if (rc != 0) { - pcre_free(re); - LM_ERR("pcre_fullinfo on compiled pattern '%s' yielded error: %d\n", - pattern, rc); - return (pcre *)0; - } - rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, cap_cnt); - if (rc != 0) { - pcre_free(re); - LM_ERR("pcre_fullinfo on compiled pattern '%s' yielded error: %d\n", - pattern, rc); - return (pcre *)0; - } - result = (pcre *)shm_malloc(size); - if (result == NULL) { + pcre *re, *result; + const char *error; + int rc, err_offset; + size_t size; + + re = pcre_compile(pattern, 0, &error, &err_offset, NULL); + if (re == NULL) { + LM_ERR("PCRE compilation of '%s' failed at offset %d: %s\n", + pattern, err_offset, error); + return (pcre *)0; + } + rc = pcre_fullinfo(re, NULL, PCRE_INFO_SIZE, &size); + if (rc != 0) { + pcre_free(re); + LM_ERR("pcre_fullinfo on compiled pattern '%s' yielded error: %d\n", + pattern, rc); + return (pcre *)0; + } + rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, cap_cnt); + if (rc != 0) { + pcre_free(re); + LM_ERR("pcre_fullinfo on compiled pattern '%s' yielded error: %d\n", + pattern, rc); + return (pcre *)0; + } + result = (pcre *)shm_malloc(size); + if (result == NULL) { + pcre_free(re); + LM_ERR("not enough shared memory for compiled PCRE pattern\n"); + return (pcre *)0; + } + memcpy(result, re, size); pcre_free(re); - LM_ERR("not enough shared memory for compiled PCRE pattern\n"); - return (pcre *)0; - } - memcpy(result, re, size); - pcre_free(re); - return result; + return result; }

13 years, 10 months

[tracker] Task opened: segfault on loading dialplan module 3.1.1

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Bayan (bayan) Attached to Project - sip-router Summary - segfault on loading dialplan module 3.1.1 Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - High Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - Version 3.1.1 segfaults on loading dialplan when loading a row with match_op 1. When the match mode was changed to 0 it works To isolate the bug we loaded kamailio dialplan module with the very simple match_op 1 regex row in the database (Postgres) and took a backtrace of the segfault. # select * from coreout_dialplan; id | dpid | pr | match_op | match_exp | match_len | subst_exp | repl_exp | attrs -----+------+----+----------+-----------+-----------+-----------+----------+------- 482 | 100 | 1 | 1 | ^201$ | 0 | | NJ | Backtrace is below: Program terminated with signal 11, Segmentation fault. #0 0x00007f435151e5da in build_rule (values=0x0) at dp_db.c:388 388 GET_STR_VALUE(repl_exp, values, 6); (gdb) bt #0 0x00007f435151e5da in build_rule (values=0x0) at dp_db.c:388 #1 0x00007f435151fb1f in dp_load_db () at dp_db.c:261 #2 0x00007f4351520182 in init_db_data () at dp_db.c:110 #3 0x00007f43515205f5 in init_data () at dp_db.c:176 #4 0x00007f435151b15d in mod_init () at dialplan.c:189 #5 0x00000000004db076 in init_mod (m=0x8fb170) at sr_module.c:872 #6 0x00000000004daff4 in init_mod (m=0x8fb570) at sr_module.c:869 #7 0x00000000004dc022 in init_modules () at sr_module.c:899 #8 0x0000000000463ec9 in main (argc=5845616, argv=0x7fff86a4ac18) at main.c:2339 (gdb) p repl_exp $1 = {s = 0x4 <Address 0x4 out of bounds>, len = 1366451880} (gdb) p values $2 = (db_val_t *) 0x0 More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=109 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.

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011