sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:d2fa6939: pua: free in case of errors

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d2fa6939e3ba075beb82d173c5d1a7330341c7d0 URL: https://github.com/kamailio/kamailio/commit/d2fa6939e3ba075beb82d173c5d1a73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 pua: free in case of errors --- Modified: src/modules/pua/add_events.c Modified: src/modules/pua/send_publish.c Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/d2fa6939e3ba075beb82d173c5d1a73… Patch: https://github.com/kamailio/kamailio/commit/d2fa6939e3ba075beb82d173c5d1a73… --- diff --git a/src/modules/pua/add_events.c b/src/modules/pua/add_events.c index f4a9c8ebed..ce94d5a842 100644 --- a/src/modules/pua/add_events.c +++ b/src/modules/pua/add_events.c @@ -150,6 +150,7 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa LM_ERR("No more memory\n"); goto error; } + alloc_tuple = 1; tuple->s= (char*)pkg_malloc(tuple_id_len* sizeof(char)); if(tuple->s== NULL) { @@ -160,7 +161,6 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa tuple->len= tuple_id_len; *tuple_param= tuple; - alloc_tuple= 1; LM_DBG("allocated tuple_id\n\n"); } @@ -252,12 +252,10 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa xmlFreeDoc(doc); if(body) pkg_free(body); - if(tuple && alloc_tuple) - { + if(tuple && alloc_tuple) { if(tuple->s) pkg_free(tuple->s); pkg_free(tuple); - tuple= NULL; } return -1; diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index fc5f2f1918..5bd13e0b59 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -457,7 +457,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) return; error: - if(*ps->param) + if(ps->param && *ps->param) { shm_free(*ps->param); *ps->param= NULL; diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index ff1f5bad23..89b597a77a 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -980,6 +980,7 @@ int send_subscribe(subs_info_t* subs) if(str_hdr== NULL || str_hdr->s== NULL) { LM_ERR("while building extra headers\n"); + if(str_hdr) pkg_free(str_hdr); return -1; }

7 years, 4 months

git:master:5238fe0a: rtpengine: free rtpl if error inside fixup_set_id()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5238fe0a5c66cf559bc099bf5e2e0ced42390625 URL: https://github.com/kamailio/kamailio/commit/5238fe0a5c66cf559bc099bf5e2e0ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 rtpengine: free rtpl if error inside fixup_set_id() --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/5238fe0a5c66cf559bc099bf5e2e0ce… Patch: https://github.com/kamailio/kamailio/commit/5238fe0a5c66cf559bc099bf5e2e0ce… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index d4f45bf7c0..83c56ab826 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1046,6 +1046,7 @@ static int fixup_set_id(void ** param, int param_no) int_val = pv_locate_name(&s); if(int_val<0 || int_val!=s.len) { LM_ERR("invalid parameter %s\n", s.s); + pkg_free(rtpl); return -1; } rtpl->rpv = pv_cache_get(&s);

7 years, 4 months

git:master:30166790: presence_xml: do not allocate memory before getting presence node

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 30166790b1b8addef006c7a933ac2c009a3998e2 URL: https://github.com/kamailio/kamailio/commit/30166790b1b8addef006c7a933ac2c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 presence_xml: do not allocate memory before getting presence node - useless operation in case of error --- Modified: src/modules/presence_xml/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/30166790b1b8addef006c7a933ac2c0… Patch: https://github.com/kamailio/kamailio/commit/30166790b1b8addef006c7a933ac2c0… --- diff --git a/src/modules/presence_xml/notify_body.c b/src/modules/presence_xml/notify_body.c index 82b4a4d96e..8872c1dccc 100644 --- a/src/modules/presence_xml/notify_body.c +++ b/src/modules/presence_xml/notify_body.c @@ -233,17 +233,6 @@ str* get_final_notify_body( subs_t *subs, str* notify_body, xmlNodePtr rule_node char* content = NULL; char all_name[KSR_FNB_NAME_SIZE+8]; - strcpy(all_name, "all-"); - - new_body = (str*)pkg_malloc(sizeof(str)); - if(new_body == NULL) - { - LM_ERR("while allocating memory\n"); - return NULL; - } - - memset(new_body, 0, sizeof(str)); - doc = xmlParseMemory(notify_body->s, notify_body->len); if(doc== NULL) { @@ -257,6 +246,16 @@ str* get_final_notify_body( subs_t *subs, str* notify_body, xmlNodePtr rule_node goto error; } + strcpy(all_name, "all-"); + + new_body = (str*)pkg_malloc(sizeof(str)); + if(new_body == NULL) + { + LM_ERR("while allocating memory\n"); + return NULL; + } + memset(new_body, 0, sizeof(str)); + transf_node = xmlNodeGetChildByName(rule_node, "transformations"); if(transf_node == NULL) { @@ -502,34 +501,21 @@ str* get_final_notify_body( subs_t *subs, str* notify_body, xmlNodePtr rule_node LM_DBG("body = \n%.*s\n", new_body->len, new_body->s); - xmlFreeDoc(doc); + xmlFreeDoc(doc); xmlFree(class_cont); xmlFree(occurence_ID); xmlFree(deviceID); xmlFree(service_uri); - xmlCleanupParser(); - xmlMemoryDump(); + xmlCleanupParser(); + xmlMemoryDump(); + + return new_body; - return new_body; error: - if(doc) + if(doc) { xmlFreeDoc(doc); - if(new_body) - { - if(new_body->s) - xmlFree(new_body->s); - pkg_free(new_body); - } - if(class_cont) - xmlFree(class_cont); - if(occurence_ID) - xmlFree(occurence_ID); - if(deviceID) - xmlFree(deviceID); - if(service_uri) - xmlFree(service_uri); - + } return NULL; }

7 years, 4 months

git:master:30014025: presence_dialoginfo: safety checks to avoid accessing null values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 30014025157f9ac79c98f1361a86974858ef8022 URL: https://github.com/kamailio/kamailio/commit/30014025157f9ac79c98f1361a86974… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 presence_dialoginfo: safety checks to avoid accessing null values --- Modified: src/modules/presence_dialoginfo/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/30014025157f9ac79c98f1361a86974… Patch: https://github.com/kamailio/kamailio/commit/30014025157f9ac79c98f1361a86974…

7 years, 4 months

git:master:fda8de91: ctl: skip condition on already set name variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fda8de91d80a2aee7a3ec5e44e6fc1d918541254 URL: https://github.com/kamailio/kamailio/commit/fda8de91d80a2aee7a3ec5e44e6fc1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 ctl: skip condition on already set name variable --- Modified: src/modules/ctl/ctrl_socks.c --- Diff: https://github.com/kamailio/kamailio/commit/fda8de91d80a2aee7a3ec5e44e6fc1d… Patch: https://github.com/kamailio/kamailio/commit/fda8de91d80a2aee7a3ec5e44e6fc1d… --- diff --git a/src/modules/ctl/ctrl_socks.c b/src/modules/ctl/ctrl_socks.c index 9e800a907b..f9d559564b 100644 --- a/src/modules/ctl/ctrl_socks.c +++ b/src/modules/ctl/ctrl_socks.c @@ -145,7 +145,7 @@ struct id_list* parse_listen_id(char* l, int len, enum socket_protos def) proto=UDP_SOCK; DBG("guess:%s is a tcp socket\n", name); } - }else if (name && strchr(name, '/')){ + }else if (strchr(name, '/')){ switch(def){ case TCP_SOCK: case UDP_SOCK:

7 years, 4 months

git:master:44db76ac: cplc: init time switch structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 44db76acb7523b3cd6816c77de45b71857b1a3c1 URL: https://github.com/kamailio/kamailio/commit/44db76acb7523b3cd6816c77de45b71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 cplc: init time switch structures --- Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/44db76acb7523b3cd6816c77de45b71… Patch: https://github.com/kamailio/kamailio/commit/44db76acb7523b3cd6816c77de45b71… --- diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index 03e9a48ae9..4a99b2cbe4 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -686,6 +686,9 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) ac_tm_t att; tmrec_t trt; + memset(&att, 0, sizeof(ac_tm_t)); + memset(&trt, 0, sizeof(tmrec_t)); + LM_DBG("checking recv. time stamp <%d>\n", intr->recv_time); switch (NR_OF_ATTR(intr->ip)) {

7 years, 4 months

git:master:3f96ede6: cplc: init structures, fix parameter number in fixup

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3f96ede632ce9ef945086a1f384677151209fcc6 URL: https://github.com/kamailio/kamailio/commit/3f96ede632ce9ef945086a1f3846771… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 cplc: init structures, fix parameter number in fixup --- Modified: src/modules/cplc/cplc.c --- Diff: https://github.com/kamailio/kamailio/commit/3f96ede632ce9ef945086a1f3846771… Patch: https://github.com/kamailio/kamailio/commit/3f96ede632ce9ef945086a1f3846771… --- diff --git a/src/modules/cplc/cplc.c b/src/modules/cplc/cplc.c index cb47ffc4e0..95cf946a83 100644 --- a/src/modules/cplc/cplc.c +++ b/src/modules/cplc/cplc.c @@ -203,7 +203,7 @@ static int fixup_cpl_run_script3(void** param, int param_no) { if (param_no==1 || param_no==2) { return fixup_cpl_run_script(param, param_no); - } else if (param_no==2) { + } else if (param_no==3) { return fixup_spve_null(param, 1); } return 0;

7 years, 4 months

git:master:9a7fee2d: cfgt: check error case for mkdir()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9a7fee2dac2f59c277d2634937c7449b9659a20d URL: https://github.com/kamailio/kamailio/commit/9a7fee2dac2f59c277d2634937c7449… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 cfgt: check error case for mkdir() --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/9a7fee2dac2f59c277d2634937c7449… Patch: https://github.com/kamailio/kamailio/commit/9a7fee2dac2f59c277d2634937c7449… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 56292fb1a2..20fcfb0fb8 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -362,7 +362,10 @@ void cfgt_save_node(cfgt_node_p node) return; } LM_DBG("dir [%s]\n", dest.s); - mkdir(dest.s, S_IRWXO|S_IXGRP|S_IRWXU); + if(mkdir(dest.s, S_IRWXO|S_IXGRP|S_IRWXU)<0) { + LM_ERR("failed to make directory (%d)\n", errno); + return; + } dest.s[dir] = '/'; fp = fopen(dest.s, "w"); LM_DBG("file [%s]\n", dest.s);

7 years, 4 months

git:master:2f29115d: auth_identity: code clarity adjustments

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2f29115d8280ccf04ea823d5cf8f6621b8624edc URL: https://github.com/kamailio/kamailio/commit/2f29115d8280ccf04ea823d5cf8f662… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 auth_identity: code clarity adjustments --- Modified: src/modules/auth_identity/auth_hdrs.c --- Diff: https://github.com/kamailio/kamailio/commit/2f29115d8280ccf04ea823d5cf8f662… Patch: https://github.com/kamailio/kamailio/commit/2f29115d8280ccf04ea823d5cf8f662… --- diff --git a/src/modules/auth_identity/auth_hdrs.c b/src/modules/auth_identity/auth_hdrs.c index 0947f5e9a1..24d2ab395f 100644 --- a/src/modules/auth_identity/auth_hdrs.c +++ b/src/modules/auth_identity/auth_hdrs.c @@ -471,7 +471,11 @@ int digeststr_asm(dynstr *sout, struct sip_msg *msg, str *sdate, int iflags) LOG(L_ERR, "AUTH_IDENTITY:digeststr_asm: DATE header is not found\n"); return -9; } + break; } + if (app2dynstr(sout,&sact)) + return -10; + break; default: if (iRes==AUTH_NOTFOUND) break; @@ -514,13 +518,14 @@ int append_hf(struct sip_msg* msg, char *str1, enum _hdr_types_t type) len=strlen(str1); - s = (char*)pkg_malloc(len); + s = (char*)pkg_malloc(len+1); if (!s) { LOG(L_ERR, "AUTH_IDENTITY:append_hf: No memory left\n"); return -1; } memcpy(s, str1, len); + s[len] = '\0'; if (insert_new_lump_before(anchor, s, len, type) == 0) { LOG(L_ERR, "AUTH_IDENTITY:append_hf: Can't insert lump\n"); @@ -643,6 +648,8 @@ static char *auth_get_hf_name(char *begin, char *end, enum _hdr_types_t *type) p += 4; goto dc_end; } + *type = HDR_OTHER_T; + break; default: /* compact headers */ switch(LOWER_BYTE(*p)) { @@ -656,6 +663,8 @@ static char *auth_get_hf_name(char *begin, char *end, enum _hdr_types_t *type) *type = HDR_CONTACT_T; return (p + 2); } + *type = HDR_OTHER_T; + break; default: *type = HDR_OTHER_T; break;

7 years, 4 months

git:master:2140d014: sipcapture: keep hep buffer unmodified while getting PV $hep(NNN)

by Mikko Lehto

Module: kamailio Branch: master Commit: 2140d0141b5a7551ebbd072d801ce2339020dac0 URL: https://github.com/kamailio/kamailio/commit/2140d0141b5a7551ebbd072d801ce23… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-31T14:42:24+03:00 sipcapture: keep hep buffer unmodified while getting PV $hep(NNN) - addition to GH PR #1191 --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/2140d0141b5a7551ebbd072d801ce23… Patch: https://github.com/kamailio/kamailio/commit/2140d0141b5a7551ebbd072d801ce23… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 8040b6680c..1653d905fe 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -973,8 +973,7 @@ int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len, int req_ch goto done; case 9: hg->time_sec = (hep_chunk_uint32_t *) (tmp); - hg->time_sec->data = ntohl(hg->time_sec->data); - ret = pv_get_uintval(msg, param, res, hg->time_sec->data); + ret = pv_get_uintval(msg, param, res, ntohl(hg->time_sec->data)); goto done; case 10:

7 years, 4 months

← Newer
1
...
6
7
8
9
10
11
12
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017