diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-16 04:40:54 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-16 04:40:54 +0000 |
| commit | af243f9bcaab1304ac9213252c8ca124e94530d8 (patch) | |
| tree | 2b84082d8285faa07556cfce5ff7367d9a22a640 /channels/chan_modem.c | |
| parent | 0324a6e8e15ec318b768e56302a9dbbf41aea376 (diff) | |
Last set of strncpy/snprintf updates (bug #2049)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3446 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_modem.c')
| -rwxr-xr-x | channels/chan_modem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_modem.c b/channels/chan_modem.c index ace64c78e..1a235c4f5 100755 --- a/channels/chan_modem.c +++ b/channels/chan_modem.c @@ -180,7 +180,7 @@ static int modem_call(struct ast_channel *ast, char *idest, int timeout) { struct ast_modem_pvt *p; int ms = timeout; - char rdest[80], *where, dstr[100]; + char rdest[80], *where, dstr[100] = ""; char *stringp=NULL; strncpy(rdest, idest, sizeof(rdest)-1); stringp=rdest; @@ -191,7 +191,7 @@ static int modem_call(struct ast_channel *ast, char *idest, int timeout) return -1; } p = ast->pvt->pvt; - strcpy(dstr,where + p->stripmsd); + strncpy(dstr, where + p->stripmsd, sizeof(dstr) - 1); /* if not a transfer or just sending tones, must be in correct state */ if (strcasecmp(rdest, "transfer") && strcasecmp(rdest,"sendtones")) { if ((ast->_state != AST_STATE_DOWN) && (ast->_state != AST_STATE_RESERVED)) { @@ -201,7 +201,7 @@ static int modem_call(struct ast_channel *ast, char *idest, int timeout) } if (!strcasecmp(rdest,"transfer")) /* if a transfer, put in transfer stuff */ { - sprintf(dstr,"!,%s",where + p->stripmsd); + snprintf(dstr, sizeof(dstr), "!,%s", where + p->stripmsd); } if (!strcasecmp(where, "handset")) { if (p->mc->setdev) |