sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
411 discussions

git:master:34265457: tsilo: coherent locking in ts_append
by Federico Cabiddu 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 34265457e7c09b56dec295b753fd8250ef8b0c41 URL: https://github.com/kamailio/kamailio/commit/34265457e7c09b56dec295b753fd825… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-24T15:16:21+02:00 tsilo: coherent locking in ts_append --- Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/34265457e7c09b56dec295b753fd825… Patch: https://github.com/kamailio/kamailio/commit/34265457e7c09b56dec295b753fd825… --- diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index e6e27e40cc..7d951865f0 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -45,32 +45,31 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { int res; int appended; - - lock_entry_by_ruri(ruri); - + if (use_domain) { t_uri = ruri; } else { if(parse_uri(ruri->s, ruri->len, &p_uri)<0) { LM_ERR("failed to parse uri %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); return -1; } t_uri = &p_uri.user; } + lock_entry_by_ruri(t_uri); + res = get_ts_urecord(t_uri, &_r); if (res != 0) { - LM_ERR("failed to retrieve record for %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); + LM_ERR("failed to retrieve record for %.*s\n", t_uri->len, t_uri->s); + unlock_entry_by_ruri(t_uri); return -1; } ptr = _r->transactions; while(ptr) { - LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, ruri->len, ruri->s); + LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, t_uri->len, t_uri->s); appended = ts_append_to(msg, ptr->tindex, ptr->tlabel, table, ruri); if (appended > 0) @@ -78,7 +77,7 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { ptr = ptr->next; } - unlock_entry_by_ruri(ruri); + unlock_entry_by_ruri(t_uri); return 1; }

1 0

git:master:0cf4ad7b: app_perl: free on error cases for modf execution
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 0cf4ad7b4e839856eef4dc2cd76adacd1627ce7c URL: https://github.com/kamailio/kamailio/commit/0cf4ad7b4e839856eef4dc2cd76adac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T13:24:49+02:00 app_perl: free on error cases for modf execution --- Modified: src/modules/app_perl/kamailioxs.xs --- Diff: https://github.com/kamailio/kamailio/commit/0cf4ad7b4e839856eef4dc2cd76adac… Patch: https://github.com/kamailio/kamailio/commit/0cf4ad7b4e839856eef4dc2cd76adac… --- diff --git a/src/modules/app_perl/kamailioxs.xs b/src/modules/app_perl/kamailioxs.xs index 8d2604c1a5..385fa1a115 100644 --- a/src/modules/app_perl/kamailioxs.xs +++ b/src/modules/app_perl/kamailioxs.xs @@ -289,6 +289,7 @@ int moduleFunc(struct sip_msg *m, char *func, LM_ERR("Module function '%s' is unsafe. Call is refused.\n", func); if (argv[0]) pkg_free(argv[0]); if (argv[1]) pkg_free(argv[1]); + pkg_free(act); *retval = -1; return -1; } @@ -297,6 +298,9 @@ int moduleFunc(struct sip_msg *m, char *func, *retval = exp_func_struct->fixup(&(act->val[3].u.data), 2); if (*retval < 0) { LM_ERR("Error in fixup (2)\n"); + if (argv[0]) pkg_free(argv[0]); + if (argv[1]) pkg_free(argv[1]); + pkg_free(act); return -1; } act->val[3].type = MODFIXUP_ST; @@ -305,6 +309,9 @@ int moduleFunc(struct sip_msg *m, char *func, *retval = exp_func_struct->fixup(&(act->val[2].u.data), 1); if (*retval < 0) { LM_ERR("Error in fixup (1)\n"); + if (argv[0]) pkg_free(argv[0]); + if (argv[1]) pkg_free(argv[1]); + pkg_free(act); return -1; } act->val[2].type = MODFIXUP_ST; @@ -313,6 +320,9 @@ int moduleFunc(struct sip_msg *m, char *func, *retval = exp_func_struct->fixup(0, 0); if (*retval < 0) { LM_ERR("Error in fixup (0)\n"); + if (argv[0]) pkg_free(argv[0]); + if (argv[1]) pkg_free(argv[1]); + pkg_free(act); return -1; } } @@ -337,7 +347,7 @@ int moduleFunc(struct sip_msg *m, char *func, if (argv[1]) pkg_free(argv[1]); pkg_free(act); - + return 1; } @@ -699,7 +709,9 @@ getFullHeader(self) LM_ERR("getFullHeader: Invalid message type.\n"); ST(0) = &PL_sv_undef; } else { - parse_headers(msg, ~0, 0); + if(parse_headers(msg, ~0, 0)<0) { + LM_ERR("failed to parse headers\n"); + } if (getType(msg) == SIP_REQUEST) { firsttoken = (msg->first_line).u.request.method.s; } else { /* SIP_REPLY */ @@ -713,7 +725,7 @@ getFullHeader(self) -((long)(firsttoken)); if (headerlen > 0) { - ST(0) = + ST(0) = sv_2mortal(newSVpv(firsttoken, headerlen)); } else { ST(0) = &PL_sv_undef; @@ -739,7 +751,9 @@ getBody(self) LM_ERR("Invalid message reference\n"); ST(0) = &PL_sv_undef; } else { - parse_headers(msg, ~0, 0); + if(parse_headers(msg, ~0, 0)<0) { + LM_ERR("failed to parse headers\n"); + } ST(0) = sv_2mortal(newSVpv(get_body(msg), 0)); } @@ -792,7 +806,9 @@ getHeader(self, name) if (!msg) { LM_ERR("Invalid message reference\n"); } else { - parse_headers(msg, ~0, 0); + if(parse_headers(msg, ~0, 0)<0) { + LM_ERR("failed to parse headers\n"); + } for (hf = msg->headers; hf; hf = hf->next) { if (namelen == hf->name.len) { if (strncmp(name, hf->name.s, namelen) == 0) { @@ -825,11 +841,13 @@ getHeaderNames(self) struct hdr_field *hf = NULL; int found = 0; PPCODE: - + if (!msg) { LM_ERR("Invalid message reference\n"); } else { - parse_headers(msg, ~0, 0); + if(parse_headers(msg, ~0, 0)<0) { + LM_ERR("failed to parse headers\n"); + } for (hf = msg->headers; hf; hf = hf->next) { found = 1; XPUSHs(sv_2mortal(newSVpv(hf->name.s, hf->name.len))); @@ -1231,17 +1249,22 @@ getParsedRURI(self) LM_ERR("Invalid message reference\n"); ST(0) = NULL; } else { - parse_sip_msg_uri(msg); - parse_headers(msg, ~0, 0); - - uri = &(msg->parsed_uri); - ret = sv_newmortal(); - sv_setref_pv(ret, "Kamailio::URI", (void *)uri); - SvREADONLY_on(SvRV(ret)); + if(parse_sip_msg_uri(msg)<0) { + LM_ERR("Invalid message uri\n"); + ST(0) = NULL; + } else { + if(parse_headers(msg, ~0, 0)<0) { + LM_ERR("failed to parse headers\n"); + } + uri = &(msg->parsed_uri); + ret = sv_newmortal(); + sv_setref_pv(ret, "Kamailio::URI", (void *)uri); + SvREADONLY_on(SvRV(ret)); - ST(0) = ret; + ST(0) = ret; + } } - + MODULE = Kamailio PACKAGE = Kamailio::URI

1 0

git:master:0f3fb6b8: xmlrpc: handle return codes
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 0f3fb6b8cb04162be07e9246c23bcfa8b8e4e4e6 URL: https://github.com/kamailio/kamailio/commit/0f3fb6b8cb04162be07e9246c23bcfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T13:00:44+02:00 xmlrpc: handle return codes --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/0f3fb6b8cb04162be07e9246c23bcfa… Patch: https://github.com/kamailio/kamailio/commit/0f3fb6b8cb04162be07e9246c23bcfa… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index ef1535cc88..61b73d0993 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -654,7 +654,7 @@ static int fix_delayed_reply_ctx(rpc_ctx_t* ctx) { if ((ctx->flags & XMLRPC_DELAYED_CTX_F) && (ctx->reply.buf.s==0)){ if (init_xmlrpc_reply(&ctx->reply) <0) return -1; - add_xmlrpc_reply(&ctx->reply, &success_prefix); + if(add_xmlrpc_reply(&ctx->reply, &success_prefix)<0) return -1; if (ctx->flags & RET_ARRAY) return add_xmlrpc_reply(&ctx->reply, &array_prefix); } @@ -787,7 +787,7 @@ static int get_rpc_document(str* doc, sip_msg_t* msg) */ static int send_reply(sip_msg_t* msg, str* body) { - if (add_lump_rpl(msg, body->s, body->len, LUMP_RPL_BODY) < 0) { + if (add_lump_rpl(msg, body->s, body->len, LUMP_RPL_BODY) == 0) { ERR("Error while adding reply lump\n"); return -1; } @@ -1965,6 +1965,7 @@ static int rpc_struct_scan(struct rpc_struct* s, char* fmt, ...) break; default: ERR("Invalid parameter type in formatting string: %c\n", *fmt); + va_end(ap); return -1; } fmt++; @@ -2176,7 +2177,7 @@ static int init_context(rpc_ctx_t* ctx, sip_msg_t* msg) ctx->doc = 0; ctx->structs = 0; if (init_xmlrpc_reply(&ctx->reply) < 0) return -1; - add_xmlrpc_reply(&ctx->reply, &success_prefix); + if (add_xmlrpc_reply(&ctx->reply, &success_prefix)<0) return -1; if (open_doc(ctx, msg) < 0) return -1; return 0; } @@ -2367,7 +2368,9 @@ static int process_xmlrpc(sip_msg_t* msg) n_method = method[0] + (method[1] << 8) + (method[2] << 16) + (method[3] << 24); n_method |= 0x20202020; - n_method &= ((method_len < 4) * (1U << method_len * 8) - 1); + if(method_len < 4) { + n_method &= ((1U << (method_len * 8)) - 1); + } /* accept only GET or POST */ if ((n_method == N_HTTP_GET) || ((n_method == N_HTTP_POST) && (method_len == HTTP_POST_LEN))) {

1 0

git:master:96582d77: xcap_client: safety check for namespace variable
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 96582d77583719d7bb9c5e5437198800ae9e7a12 URL: https://github.com/kamailio/kamailio/commit/96582d77583719d7bb9c5e543719880… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T12:22:00+02:00 xcap_client: safety check for namespace variable --- Modified: src/modules/xcap_client/xcap_functions.c --- Diff: https://github.com/kamailio/kamailio/commit/96582d77583719d7bb9c5e543719880… Patch: https://github.com/kamailio/kamailio/commit/96582d77583719d7bb9c5e543719880… --- diff --git a/src/modules/xcap_client/xcap_functions.c b/src/modules/xcap_client/xcap_functions.c index 6b875b17d0..cee161b7d0 100644 --- a/src/modules/xcap_client/xcap_functions.c +++ b/src/modules/xcap_client/xcap_functions.c @@ -223,7 +223,7 @@ xcap_node_sel_t* xcapNodeSelAddStep(xcap_node_sel_t* curr_sel, str* name, } curr_sel->size+= 1+ new_step.len; - if(namespace->len) + if(namespace && namespace->len) { curr_sel->size+= namespace->len+ 3; }

1 0

git:master:e6e04f4c: xcap_client: removed unused api function get_elem()
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: e6e04f4c96e5fdd7a3a90f265fd6cb7470f1135b URL: https://github.com/kamailio/kamailio/commit/e6e04f4c96e5fdd7a3a90f265fd6cb7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T12:15:55+02:00 xcap_client: removed unused api function get_elem() --- Modified: src/modules/xcap_client/xcap_functions.c Modified: src/modules/xcap_client/xcap_functions.h --- Diff: https://github.com/kamailio/kamailio/commit/e6e04f4c96e5fdd7a3a90f265fd6cb7… Patch: https://github.com/kamailio/kamailio/commit/e6e04f4c96e5fdd7a3a90f265fd6cb7… --- diff --git a/src/modules/xcap_client/xcap_functions.c b/src/modules/xcap_client/xcap_functions.c index 1b2e6b457f..6b875b17d0 100644 --- a/src/modules/xcap_client/xcap_functions.c +++ b/src/modules/xcap_client/xcap_functions.c @@ -50,7 +50,6 @@ int bind_xcap(xcap_api_t* api) LM_ERR("Invalid parameter value\n"); return -1; } - api->get_elem= xcapGetElem; api->int_node_sel= xcapInitNodeSel; api->add_step= xcapNodeSelAddStep; api->add_terminal= xcapNodeSelAddTerminal; @@ -455,39 +454,6 @@ char* get_xcap_path(xcap_get_req_t req) return NULL; } -/* xcap_root must be a NULL terminated string */ - -char* xcapGetElem(xcap_get_req_t req, char** etag) -{ - char* path= NULL; - char* stream= NULL; - - path= get_xcap_path(req); - if(path== NULL) - { - LM_ERR("while constructing xcap path\n"); - return NULL; - } - - stream= send_http_get(path, req.port, req.etag, req.match_type, etag); - if(stream== NULL) - { - LM_DBG("the serched element was not found\n"); - } - - if(etag== NULL) - { - LM_ERR("no etag found\n"); - pkg_free(stream); - stream= NULL; - } - - if(path) - pkg_free(path); - - return stream; -} - size_t get_xcap_etag( void *ptr, size_t size, size_t nmemb, void *stream) { int len= 0; diff --git a/src/modules/xcap_client/xcap_functions.h b/src/modules/xcap_client/xcap_functions.h index 8750aeae53..44ae635972 100644 --- a/src/modules/xcap_client/xcap_functions.h +++ b/src/modules/xcap_client/xcap_functions.h @@ -103,11 +103,6 @@ xcap_node_sel_t* xcapNodeSelAddTerminal(xcap_node_sel_t* curr_sel, typedef xcap_node_sel_t* (*xcap_nodeSel_add_terminal_t)(xcap_node_sel_t* curr_sel, char* attr_sel, char* namespace_sel, char* extra_sel ); -/* generical function to get an element from an xcap server */ -char* xcapGetElem(xcap_get_req_t req, char** etag); - -typedef char* (*xcap_get_elem_t)(xcap_get_req_t req, char** etag); - void xcapFreeNodeSel(xcap_node_sel_t* node); typedef void (*xcap_nodeSel_free_t)(xcap_node_sel_t* node); @@ -118,7 +113,6 @@ char* xcapGetNewDoc(xcap_get_req_t req, str user, str domain); typedef char* (*xcapGetNewDoc_t)(xcap_get_req_t req, str user, str domain); typedef struct xcap_api { - xcap_get_elem_t get_elem; xcap_nodeSel_init_t int_node_sel; xcap_nodeSel_add_step_t add_step; xcap_nodeSel_add_terminal_t add_terminal;

1 0

git:master:8147009b: xcap_client: handle return code for strchr()
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 8147009b34639304fb75d4f6c39269c49ee385ca URL: https://github.com/kamailio/kamailio/commit/8147009b34639304fb75d4f6c39269c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T12:15:09+02:00 xcap_client: handle return code for strchr() --- Modified: src/modules/xcap_client/xcap_client.c --- Diff: https://github.com/kamailio/kamailio/commit/8147009b34639304fb75d4f6c39269c… Patch: https://github.com/kamailio/kamailio/commit/8147009b34639304fb75d4f6c39269c… --- diff --git a/src/modules/xcap_client/xcap_client.c b/src/modules/xcap_client/xcap_client.c index e96511651d..0b8a707d8d 100644 --- a/src/modules/xcap_client/xcap_client.c +++ b/src/modules/xcap_client/xcap_client.c @@ -310,24 +310,33 @@ int parse_doc_url(str doc_url, char** serv_addr, xcap_doc_sel_t* doc_sel) char* sl, *str_type; sl= strchr(doc_url.s, '/'); + if(sl==NULL) { + return -1; + } *sl= '\0'; *serv_addr= doc_url.s; sl++; doc_sel->auid.s= sl; sl= strchr(sl, '/'); + if(sl==NULL) { + return -1; + } doc_sel->auid.len= sl- doc_sel->auid.s; sl++; str_type= sl; sl= strchr(sl, '/'); + if(sl==NULL) { + return -1; + } *sl= '\0'; - if(strcasecmp(str_type, "users")== 0) + if(strcasecmp(str_type, "users")== 0) { doc_sel->type= USERS_TYPE; - else - if(strcasecmp(str_type, "group")== 0) + } else if(strcasecmp(str_type, "group")== 0) { doc_sel->type= GLOBAL_TYPE; + } sl++;

1 0

git:master:37129325: presence_xml: fixed misleading error message
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 371293257d000c004f78068f15a4184df3dbd57b URL: https://github.com/kamailio/kamailio/commit/371293257d000c004f78068f15a4184… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T12:14:18+02:00 presence_xml: fixed misleading error message --- Modified: src/modules/presence_xml/presence_xml.c --- Diff: https://github.com/kamailio/kamailio/commit/371293257d000c004f78068f15a4184… Patch: https://github.com/kamailio/kamailio/commit/371293257d000c004f78068f15a4184… --- diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index da0e056e3e..0f221852d7 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -242,7 +242,7 @@ static int mod_init(void) xcap_GetNewDoc= xcap_api.getNewDoc; if(xcap_GetNewDoc== NULL) { - LM_ERR("can't import get_elem from xcap_client module\n"); + LM_ERR("can't import getNewDoc from xcap_client module\n"); return -1; } @@ -559,4 +559,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_presence_xml_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:4ba40243: stun: link attribute when calling stun_parse_body() with an existing list
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 4ba402434449ec9cb426d5200b12c5cec4d07ab4 URL: https://github.com/kamailio/kamailio/commit/4ba402434449ec9cb426d5200b12c5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T11:56:57+02:00 stun: link attribute when calling stun_parse_body() with an existing list --- Modified: src/modules/stun/kam_stun.c --- Diff: https://github.com/kamailio/kamailio/commit/4ba402434449ec9cb426d5200b12c5c… Patch: https://github.com/kamailio/kamailio/commit/4ba402434449ec9cb426d5200b12c5c… --- diff --git a/src/modules/stun/kam_stun.c b/src/modules/stun/kam_stun.c index 8257fbab4c..350317b0e7 100644 --- a/src/modules/stun/kam_stun.c +++ b/src/modules/stun/kam_stun.c @@ -336,8 +336,10 @@ static int stun_parse_body( } if (*unknown == NULL) { *unknown = body = tmp_unknown; - } - else { + } else { + if(body==NULL) { + body = *unknown; + } body->next = tmp_unknown; body = body->next; }

1 0

git:master:f75eba63: statsd: simplified error handling inside statsd_connect()
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: f75eba63a1f0176adc8cd38846a0d1943471e10c URL: https://github.com/kamailio/kamailio/commit/f75eba63a1f0176adc8cd38846a0d19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T11:44:21+02:00 statsd: simplified error handling inside statsd_connect() --- Modified: src/modules/statsd/lib_statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/f75eba63a1f0176adc8cd38846a0d19… Patch: https://github.com/kamailio/kamailio/commit/f75eba63a1f0176adc8cd38846a0d19… --- diff --git a/src/modules/statsd/lib_statsd.c b/src/modules/statsd/lib_statsd.c index bbda181d6a..79d99fcfbd 100644 --- a/src/modules/statsd/lib_statsd.c +++ b/src/modules/statsd/lib_statsd.c @@ -29,25 +29,24 @@ bool statsd_connect(void){ rc = getaddrinfo( statsd_connection.ip, statsd_connection.port, NULL, &serverAddr); - if (rc != 0) + if (rc != 0 || serverAddr == NULL) { - LM_ERR( - "Statsd: could not initiate server information (%s)\n", + LM_ERR("Statsd: could not initiate server information (%s)\n", gai_strerror(rc)); - if(serverAddr) freeaddrinfo(serverAddr); + if(serverAddr) freeaddrinfo(serverAddr); return false; } statsd_connection.sock = socket(serverAddr->ai_family, SOCK_DGRAM, IPPROTO_UDP); if (statsd_connection.sock < 0 ){ LM_ERR("Statsd: could not create a socket for statsd connection\n"); - if(serverAddr) freeaddrinfo(serverAddr); + freeaddrinfo(serverAddr); return false; } - rc = connect( - statsd_connection.sock, serverAddr->ai_addr, serverAddr->ai_addrlen); - freeaddrinfo(serverAddr); + rc = connect(statsd_connection.sock, serverAddr->ai_addr, + serverAddr->ai_addrlen); + freeaddrinfo(serverAddr); if (rc < 0){ LM_ERR("Statsd: could not initiate a connect to statsd\n"); return false;

1 0

git:master:711a5600: statistics: free vars in case of error in fixup function
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 711a5600330793b2ca787ce451f2ad48620dd639 URL: https://github.com/kamailio/kamailio/commit/711a5600330793b2ca787ce451f2ad4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T11:38:51+02:00 statistics: free vars in case of error in fixup function --- Modified: src/modules/statistics/statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/711a5600330793b2ca787ce451f2ad4… Patch: https://github.com/kamailio/kamailio/commit/711a5600330793b2ca787ce451f2ad4… --- diff --git a/src/modules/statistics/statistics.c b/src/modules/statistics/statistics.c index 499b4198ba..c5ace8c185 100644 --- a/src/modules/statistics/statistics.c +++ b/src/modules/statistics/statistics.c @@ -135,6 +135,7 @@ static int fixup_stat(void** param, int param_no) if (s.s[0]=='$') { if (fixup_pvar_null(param, 1)!=0) { LM_ERR("invalid pv %s as parameter\n",s.s); + pkg_free(sopv); return E_CFG; } sopv->pv = (pv_spec_t*)(*param); @@ -143,10 +144,10 @@ static int fixup_stat(void** param, int param_no) sopv->stat = get_stat( &s ); if (sopv->stat==0) { LM_ERR("variable <%s> not defined\n", s.s); + pkg_free(sopv); return E_CFG; } } - pkg_free(s.s); *param=(void*)sopv; return 0; } else if (param_no==2) { @@ -160,6 +161,7 @@ static int fixup_stat(void** param, int param_no) if (s.s[0] == '$') { if (fixup_pvar_pvar(param, 2) != 0) { LM_ERR("invalid pv %s as parameter\n",s.s); + pkg_free(lopv); return E_CFG; } lopv->pv = (pv_spec_t*) (*param); @@ -179,13 +181,14 @@ static int fixup_stat(void** param, int param_no) if (err==0){ if (n==0 && (s.s[0]!='$')) { //we can't check the value of the pvar so have to ignore this check if it is a pvar LM_ERR("update with 0 has no sense\n"); + pkg_free(lopv); return E_CFG; } - pkg_free(s.s); *param=(void*)lopv; return 0; }else{ LM_ERR("bad update number <%s>\n",(char*)(*param)); + pkg_free(lopv); return E_CFG; } }

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017