sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
387 discussions

git:master:47a776ef: http_client: check first if pointer is not exceeding limit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 47a776efcd3d5c2ffafdd780fa169edc85e436d2 URL: https://github.com/kamailio/kamailio/commit/47a776efcd3d5c2ffafdd780fa169ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-26T22:29:27+01:00 http_client: check first if pointer is not exceeding limit - then test its value not to be null char --- Modified: modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/47a776efcd3d5c2ffafdd780fa169ed… Patch: https://github.com/kamailio/kamailio/commit/47a776efcd3d5c2ffafdd780fa169ed… --- diff --git a/modules/http_client/curlcon.c b/modules/http_client/curlcon.c index aa61860..b38a352 100644 --- a/modules/http_client/curlcon.c +++ b/modules/http_client/curlcon.c @@ -575,7 +575,7 @@ int fixup_raw_http_client_conn_list(void) schema.s = raw_cc->url.s; pos = schema.s; end = raw_cc->url.s + raw_cc->url.len; - while (pos != '\0' && (pos < end)) + while ((pos < end) && (*pos != '\0')) { if (*pos == ':') break; pos++;

8 years, 8 months

git:master:bedd6f4d: usrloc: if no location record loaded from db, then no attrs to look up

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bedd6f4df9d2b5600bed5e31052bc49f8b18382f URL: https://github.com/kamailio/kamailio/commit/bedd6f4df9d2b5600bed5e31052bc49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-26T13:09:53+01:00 usrloc: if no location record loaded from db, then no attrs to look up --- Modified: modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/bedd6f4df9d2b5600bed5e31052bc49… Patch: https://github.com/kamailio/kamailio/commit/bedd6f4df9d2b5600bed5e31052bc49… --- diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index d57f212..58fc9a3 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -697,6 +697,8 @@ urecord_t* db_load_urecord(db1_con_t* _c, udomain_t* _d, str *_aor) goto done; } + if(r==0) goto done; + for (c = r->contacts; c != NULL; c = c->next) { vals[0].val.str_val.s = c->ruid.s; vals[0].val.str_val.len = c->ruid.len;

8 years, 8 months

git:master:3a25e489: seas: init variable to get rid of compile warning

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3a25e489d0ab8d55d4011ccf62de4f3d8d08b028 URL: https://github.com/kamailio/kamailio/commit/3a25e489d0ab8d55d4011ccf62de4f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-26T13:01:01+01:00 seas: init variable to get rid of compile warning --- Modified: modules/seas/encode_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/3a25e489d0ab8d55d4011ccf62de4f3… Patch: https://github.com/kamailio/kamailio/commit/3a25e489d0ab8d55d4011ccf62de4f3… --- diff --git a/modules/seas/encode_msg.c b/modules/seas/encode_msg.c index e56b5fb..8f84ca6 100644 --- a/modules/seas/encode_msg.c +++ b/modules/seas/encode_msg.c @@ -148,7 +148,7 @@ char get_header_code(struct hdr_field *hf) */ int encode_msg(struct sip_msg *msg,char *payload,int len) { - int i,j,k,u,request; + int i,j=0,k,u,request; unsigned short int h; struct hdr_field* hf; struct msg_start* ms;

8 years, 8 months

git:master:5075cef8: lib/trie: init variable to get rid of compile warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5075cef8230202138bf08c402797d9dffcb8971d URL: https://github.com/kamailio/kamailio/commit/5075cef8230202138bf08c402797d9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-26T12:58:33+01:00 lib/trie: init variable to get rid of compile warnings --- Modified: lib/trie/dtrie.c --- Diff: https://github.com/kamailio/kamailio/commit/5075cef8230202138bf08c402797d9d… Patch: https://github.com/kamailio/kamailio/commit/5075cef8230202138bf08c402797d9d… --- diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index f0b2655..28e7e7a 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -245,7 +245,7 @@ void **dtrie_longest_match(struct dtrie_node_t *root, const char *number, digit = number[i]; if (digit>127) return ret; } - + if (node->child[digit] == NULL) return ret; node = node->child[digit]; i++; @@ -262,7 +262,7 @@ void **dtrie_longest_match(struct dtrie_node_t *root, const char *number, void **dtrie_contains(struct dtrie_node_t *root, const char *number, const unsigned int numberlen, const unsigned int branches) { - int nmatch; + int nmatch = 0; void **ret; ret = dtrie_longest_match(root, number, numberlen, &nmatch, branches);

8 years, 8 months

git:master:0a51e8c9: ndb_redis: safety check for log message parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0a51e8c941b1c916137eb3e57fa7db86ecb9a1f8 URL: https://github.com/kamailio/kamailio/commit/0a51e8c941b1c916137eb3e57fa7db8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-26T11:26:29+01:00 ndb_redis: safety check for log message parameters --- Modified: modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/0a51e8c941b1c916137eb3e57fa7db8… Patch: https://github.com/kamailio/kamailio/commit/0a51e8c941b1c916137eb3e57fa7db8… --- diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index 02aa7b8..903284e 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -429,7 +429,8 @@ void * redisc_exec_argv(redisc_server_t *rsrv, int argc, const char **argv, cons if(rsrv==NULL || rsrv->ctxRedis==NULL) { LM_ERR("no redis context found for server %.*s\n", - rsrv->sname->len, rsrv->sname->s); + (rsrv)?rsrv->sname->len:0, + (rsrv)?rsrv->sname->s:""); return NULL; } if(argc<=0)

8 years, 8 months

git:master:cafb1522: dispatcher: proper check for ds active ping variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cafb1522b2c27aae404d97fe242324423ccdb99b URL: https://github.com/kamailio/kamailio/commit/cafb1522b2c27aae404d97fe2423244… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-26T11:22:32+01:00 dispatcher: proper check for ds active ping variable --- Modified: modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cafb1522b2c27aae404d97fe2423244… Patch: https://github.com/kamailio/kamailio/commit/cafb1522b2c27aae404d97fe2423244… --- diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index cec1d46..a8061ec 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -113,7 +113,7 @@ int ds_ping_active_init(void) */ int ds_ping_active_get(void) { - if(_ds_ping_active!=NULL) + if(_ds_ping_active==NULL) return -1; return *_ds_ping_active; } @@ -123,7 +123,7 @@ int ds_ping_active_get(void) */ int ds_ping_active_set(int v) { - if(_ds_ping_active!=NULL) + if(_ds_ping_active==NULL) return -1; *_ds_ping_active = v; return 0;

8 years, 8 months

git:master:181c3cfa: crypto: safety check for memory allocation and free on error cases

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 181c3cfa266ec5897cc2fdd889d90928f90fcbb8 URL: https://github.com/kamailio/kamailio/commit/181c3cfa266ec5897cc2fdd889d9092… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-26T11:18:36+01:00 crypto: safety check for memory allocation and free on error cases --- Modified: modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/181c3cfa266ec5897cc2fdd889d9092… Patch: https://github.com/kamailio/kamailio/commit/181c3cfa266ec5897cc2fdd889d9092… --- diff --git a/modules/crypto/crypto_mod.c b/modules/crypto/crypto_mod.c index 2517b60..fe16b6d 100644 --- a/modules/crypto/crypto_mod.c +++ b/modules/crypto/crypto_mod.c @@ -360,9 +360,14 @@ unsigned char *crypto_aes_encrypt(EVP_CIPHER_CTX *e, unsigned char *plaintext, int c_len = *len + AES_BLOCK_SIZE - 1, f_len = 0; unsigned char *ciphertext = (unsigned char *)malloc(c_len); + if(ciphertext == NULL) { + LM_ERR("no more system memory\n"); + return NULL; + } /* allows reusing of 'e' for multiple encryption cycles */ if(!EVP_EncryptInit_ex(e, NULL, NULL, NULL, NULL)){ LM_ERR("failure in EVP_EncryptInit_ex \n"); + free(ciphertext); return NULL; } @@ -370,12 +375,14 @@ unsigned char *crypto_aes_encrypt(EVP_CIPHER_CTX *e, unsigned char *plaintext, * generated, *len is the size of plaintext in bytes */ if(!EVP_EncryptUpdate(e, ciphertext, &c_len, plaintext, *len)){ LM_ERR("failure in EVP_EncryptUpdate \n"); + free(ciphertext); return NULL; } /* update ciphertext with the final remaining bytes */ if(!EVP_EncryptFinal_ex(e, ciphertext+c_len, &f_len)){ LM_ERR("failure in EVP_EncryptFinal_ex \n"); + free(ciphertext); return NULL; } @@ -393,18 +400,25 @@ unsigned char *crypto_aes_decrypt(EVP_CIPHER_CTX *e, unsigned char *ciphertext, int p_len = *len, f_len = 0; unsigned char *plaintext = (unsigned char *)malloc(p_len); + if(plaintext==NULL) { + LM_ERR("no more system memory\n"); + return NULL; + } if(!EVP_DecryptInit_ex(e, NULL, NULL, NULL, NULL)){ LM_ERR("failure in EVP_DecryptInit_ex \n"); + free(plaintext); return NULL; } if(!EVP_DecryptUpdate(e, plaintext, &p_len, ciphertext, *len)){ LM_ERR("failure in EVP_DecryptUpdate\n"); + free(plaintext); return NULL; } if(!EVP_DecryptFinal_ex(e, plaintext+p_len, &f_len)){ LM_ERR("failure in EVP_DecryptFinal_ex\n"); + free(plaintext); return NULL; }

8 years, 8 months

git:master:fa0d3267: cnxcc: use pkg-config for libevent compile flags

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fa0d3267890e77a5184490d11f76fe4cb400e2df URL: https://github.com/kamailio/kamailio/commit/fa0d3267890e77a5184490d11f76fe4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-26T11:11:25+01:00 cnxcc: use pkg-config for libevent compile flags --- Modified: modules/cnxcc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/fa0d3267890e77a5184490d11f76fe4… Patch: https://github.com/kamailio/kamailio/commit/fa0d3267890e77a5184490d11f76fe4… --- diff --git a/modules/cnxcc/Makefile b/modules/cnxcc/Makefile index af6979e..7748a37 100644 --- a/modules/cnxcc/Makefile +++ b/modules/cnxcc/Makefile @@ -10,10 +10,8 @@ NAME=cnxcc.so ifeq ($(CROSS_COMPILE),) HIREDIS_BUILDER = $(shell \ - if pkg-config --exists libcre; then \ + if pkg-config --exists hiredis; then \ echo 'pkg-config hiredis'; \ - else \ - which pcre-config; \ fi) endif @@ -23,10 +21,31 @@ ifeq ($(HIREDIS_BUILDER),) else HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) + +ifeq ($(HIREDISLIBS),-L -lhiredis) + HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) /opt/local/include + HIREDISLIBS = -L/opt/local/lib -lhiredis +endif + +endif + +ifeq ($(CROSS_COMPILE),) +LEVENT_BUILDER = $(shell \ + if pkg-config --exists libevent; then \ + echo 'pkg-config libevent'; \ + fi) +endif + +ifeq ($(LEVENT_BUILDER),) + LEVENTDEFS= + LEVENTLIBS=-L$(LOCALBASE)/lib -levent +else + LEVENTDEFS = $(shell $(LEVENT_BUILDER) --cflags) + LEVENTLIBS = $(shell $(LEVENT_BUILDER) --libs) endif -DEFS+=$(HIREDISDEFS) -LIBS=$(HIREDISLIBS) -levent +DEFS+=$(HIREDISDEFS) $(LEVENTDEFS) +LIBS=$(HIREDISLIBS) $(LEVENTLIBS) DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib

8 years, 8 months

git:master:4a40dd39: ndb_redis: fix for broken output of pkg-config for hiredis

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4a40dd39cec713c569dc3480c905d808026aad39 URL: https://github.com/kamailio/kamailio/commit/4a40dd39cec713c569dc3480c905d80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-26T11:05:26+01:00 ndb_redis: fix for broken output of pkg-config for hiredis --- Modified: modules/ndb_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/4a40dd39cec713c569dc3480c905d80… Patch: https://github.com/kamailio/kamailio/commit/4a40dd39cec713c569dc3480c905d80… --- diff --git a/modules/ndb_redis/Makefile b/modules/ndb_redis/Makefile index 524647d..5874c31 100644 --- a/modules/ndb_redis/Makefile +++ b/modules/ndb_redis/Makefile @@ -7,10 +7,8 @@ NAME=ndb_redis.so ifeq ($(CROSS_COMPILE),) HIREDIS_BUILDER = $(shell \ - if pkg-config --exists libcre; then \ + if pkg-config --exists hiredis; then \ echo 'pkg-config hiredis'; \ - else \ - which pcre-config; \ fi) endif @@ -20,6 +18,12 @@ ifeq ($(HIREDIS_BUILDER),) else HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) + +ifeq ($(HIREDISLIBS),-L -lhiredis) + HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) /opt/local/include + HIREDISLIBS = -L/opt/local/lib -lhiredis +endif + endif DEFS+=$(HIREDISDEFS)

8 years, 8 months

git:master:162ccdae: cnxcc: use pkg-config for hiredis lib compile flags

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 162ccdaeeb6bff185f49b3dc2e2b9b43687ec0fc URL: https://github.com/kamailio/kamailio/commit/162ccdaeeb6bff185f49b3dc2e2b9b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-26T10:23:02+01:00 cnxcc: use pkg-config for hiredis lib compile flags --- Modified: modules/cnxcc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/162ccdaeeb6bff185f49b3dc2e2b9b4… Patch: https://github.com/kamailio/kamailio/commit/162ccdaeeb6bff185f49b3dc2e2b9b4… --- diff --git a/modules/cnxcc/Makefile b/modules/cnxcc/Makefile index e5c69df..af6979e 100644 --- a/modules/cnxcc/Makefile +++ b/modules/cnxcc/Makefile @@ -1,14 +1,33 @@ # # cnxcc module makefile # -# +# # WARNING: do not run this directly, it should be run by the master Makefile include ../../Makefile.defs auto_gen= NAME=cnxcc.so -LIBS=-lhiredis -levent +ifeq ($(CROSS_COMPILE),) +HIREDIS_BUILDER = $(shell \ + if pkg-config --exists libcre; then \ + echo 'pkg-config hiredis'; \ + else \ + which pcre-config; \ + fi) +endif + +ifeq ($(HIREDIS_BUILDER),) + HIREDISDEFS=-I$(LOCALBASE)/include + HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis +else + HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) + HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) +endif + +DEFS+=$(HIREDISDEFS) +LIBS=$(HIREDISLIBS) -levent + DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kmi/kmi

8 years, 8 months

← Newer
1
...
13
14
15
16
17
18
19
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2016