diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-25 14:44:50 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-25 14:44:50 +0000 |
| commit | 470f688a28975e63c0df4ffdb8a0ac490f4cf3d9 (patch) | |
| tree | a306715b687622ba9fa6548dc30e79f9c1e1b057 /cdr | |
| parent | 6b11ab9b13141b94402e953c33feebcc2e81f542 (diff) | |
Merged revisions 46200 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r46200 | kpfleming | 2006-10-25 09:32:08 -0500 (Wed, 25 Oct 2006) | 2 lines
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/trunk@46201 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
| -rw-r--r-- | cdr/cdr_custom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c index 803c3d9b7..995531761 100644 --- a/cdr/cdr_custom.c +++ b/cdr/cdr_custom.c @@ -77,9 +77,9 @@ static int load_config(int reload) while(var) { ast_mutex_lock(&lock); if (!ast_strlen_zero(var->name) && !ast_strlen_zero(var->value)) { - if (strlen(var->value) > (sizeof(format) - 2)) + if (strlen(var->value) > (sizeof(format) - 1)) ast_log(LOG_WARNING, "Format string too long, will be truncated, at line %d\n", var->lineno); - strncpy(format, var->value, sizeof(format) - 2); + ast_copy_string(format, var->value, sizeof(format) - 1); strcat(format,"\n"); snprintf(master, sizeof(master),"%s/%s/%s", ast_config_AST_LOG_DIR, name, var->name); ast_mutex_unlock(&lock); |