Module: kamailio Branch: master Commit: 7be06d444a0ca295e53efadb093f07e19a18cea8 URL: https://github.com/kamailio/kamailio/commit/7be06d444a0ca295e53efadb093f07e1...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2019-11-25T11:29:16+01:00

pike: use snprintf() instead of sprintf()

---

Modified: src/modules/pike/pike_top.c

---

Diff: https://github.com/kamailio/kamailio/commit/7be06d444a0ca295e53efadb093f07e1... Patch: https://github.com/kamailio/kamailio/commit/7be06d444a0ca295e53efadb093f07e1...

---

diff --git a/src/modules/pike/pike_top.c b/src/modules/pike/pike_top.c index 662f26a5de..62d23b0fc3 100644 --- a/src/modules/pike/pike_top.c +++ b/src/modules/pike/pike_top.c @@ -41,22 +41,28 @@ char *pike_top_print_addr( unsigned char *ip, int iplen, char *buff, int buffsize ) { unsigned short *ipv6_ptr = (unsigned short *)ip; - memset(buff, 0, PIKE_BUFF_SIZE*sizeof(char)); + int bsize; + int blen; + + bsize = PIKE_BUFF_SIZE*sizeof(char); + memset(buff, 0, bsize);

DBG("pike:top:print_addr(iplen: %d, buffsize: %d)", iplen, buffsize);

if ( iplen == 4 ) { inet_ntop(AF_INET, ip, buff, buffsize); - } - else if ( iplen == 16 ) { + } else if ( iplen == 16 ) { inet_ntop(AF_INET6, ip, buff, buffsize); - } - else { - sprintf( buff, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x", + } else { + blen = snprintf(buff, bsize, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x", htons(ipv6_ptr[0]), htons(ipv6_ptr[1]), htons(ipv6_ptr[2]), htons(ipv6_ptr[3]), htons(ipv6_ptr[4]), htons(ipv6_ptr[5]), htons(ipv6_ptr[6]), htons(ipv6_ptr[7])); + if(blen < 0 || blen >= bsize) { + LM_ERR("failed to print the address - reset it\n"); + memset(buff, 0, bsize); + } }

return buff;