From 000e0986072e528276eb7ea9a37728b5b0e6be76 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Wed, 25 Oct 2006 14:32:08 +0000 Subject: apparently developers are still not aware that they should be use ast_copy_string instead of strncpy... fix up many more users, and fix some bugs in the process git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@46200 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_alsa.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'channels/chan_alsa.c') diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 58b5e0ea8..6d4617a6c 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -1158,7 +1158,7 @@ static int console_dial_deprecated(int fd, int argc, char *argv[]) myc = context; if (argc == 2) { char *stringp = NULL; - strncpy(tmp, argv[1], sizeof(tmp) - 1); + ast_copy_string(tmp, argv[1], sizeof(tmp)); stringp = tmp; strsep(&stringp, "@"); tmp2 = strsep(&stringp, "@"); @@ -1168,8 +1168,8 @@ static int console_dial_deprecated(int fd, int argc, char *argv[]) myc = tmp2; } if (ast_exists_extension(NULL, myc, mye, 1, NULL)) { - strncpy(alsa.exten, mye, sizeof(alsa.exten) - 1); - strncpy(alsa.context, myc, sizeof(alsa.context) - 1); + ast_copy_string(alsa.exten, mye, sizeof(alsa.exten)); + ast_copy_string(alsa.context, myc, sizeof(alsa.context)); hookstate = 1; alsa_new(&alsa, AST_STATE_RINGING); } else @@ -1215,7 +1215,7 @@ static int console_dial(int fd, int argc, char *argv[]) myc = context; if (argc == 3) { char *stringp = NULL; - strncpy(tmp, argv[2], sizeof(tmp) - 1); + ast_copy_string(tmp, argv[2], sizeof(tmp)); stringp = tmp; strsep(&stringp, "@"); tmp2 = strsep(&stringp, "@"); @@ -1225,8 +1225,8 @@ static int console_dial(int fd, int argc, char *argv[]) myc = tmp2; } if (ast_exists_extension(NULL, myc, mye, 1, NULL)) { - strncpy(alsa.exten, mye, sizeof(alsa.exten) - 1); - strncpy(alsa.context, myc, sizeof(alsa.context) - 1); + ast_copy_string(alsa.exten, mye, sizeof(alsa.exten)); + ast_copy_string(alsa.context, myc, sizeof(alsa.context)); hookstate = 1; alsa_new(&alsa, AST_STATE_RINGING); } else -- cgit v1.2.3