mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-24 22:58:21 +00:00
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: https://origsvn.digium.com/svn/asterisk/trunk@46201 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user