From 2d66183adf20c8b3898a3bfc97627d55dff7891f Mon Sep 17 00:00:00 2001 From: tilghman Date: Fri, 7 Mar 2008 06:36:33 +0000 Subject: Safely use the strncat() function. (closes issue #11958) Reported by: norman Patches: 20080209__bug11958.diff.txt uploaded by Corydon76 (license 14) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@106552 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_misdn.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'channels') diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 47505dfdd..c70c45938 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2246,8 +2246,7 @@ static int misdn_digit_end(struct ast_channel *ast, char digit, unsigned int dur buf[1]=0; l = sizeof(bc->infos_pending); - strncat(bc->infos_pending,buf,l); - bc->infos_pending[l-1] = 0; + strncat(bc->infos_pending, buf, l - strlen(bc->infos_pending) - 1); } break; case MISDN_CALLING_ACKNOWLEDGE: @@ -2257,8 +2256,7 @@ static int misdn_digit_end(struct ast_channel *ast, char digit, unsigned int dur { int l = sizeof(bc->dad); - strncat(bc->dad,bc->info_dad, l - strlen(bc->dad)); - bc->dad[l-1] = 0; + strncat(bc->dad, bc->info_dad, l - strlen(bc->dad) - 1); } { int l = sizeof(p->ast->exten); @@ -4054,8 +4052,7 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data) } l = sizeof(bc->dad); - strncat(bc->dad,bc->info_dad, l); - bc->dad[l-1] = 0; + strncat(bc->dad,bc->info_dad, l - strlen(bc->dad) - 1); l = sizeof(ch->ast->exten); strncpy(ch->ast->exten, bc->dad, l); @@ -4133,8 +4130,7 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data) if (ch->state != MISDN_CONNECTED ) { if (digits) { int l = sizeof(bc->dad); - strncat(bc->dad,bc->info_dad, l); - bc->dad[l-1] = 0; + strncat(bc->dad, bc->info_dad, l - strlen(bc->dad) - 1); l = sizeof(ch->ast->exten); strncpy(ch->ast->exten, bc->dad, l); ch->ast->exten[l-1] = 0; @@ -4436,8 +4432,7 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data) { int l = sizeof(bc->dad); - strncat(bc->dad,bc->infos_pending, l - strlen(bc->dad)); - bc->dad[l-1] = 0; + strncat(bc->dad, bc->infos_pending, l - strlen(bc->dad) - 1); } if (!ch->ast) break; -- cgit v1.2.3