kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 03:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Instead of using strncpy, use ast_copy_string. Also, in the case of copying a

Browse Source 
constant string into a buffer that we know is big enough, don't use a length
limited copy at all, use strcpy.

... as stated in the coding guidelines.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18721 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-04-10 02:05:59 +00:00
parent d13bc3fc83
commit 9a5c7c75a3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/res_config_pgsql.c
View File

@@ -651,17 +651,17 @@ int parse_config(void)
if (!(s = ast_variable_retrieve(config, "general", "dbuser"))) { if (!(s = ast_variable_retrieve(config, "general", "dbuser"))) {
ast_log(LOG_WARNING, ast_log(LOG_WARNING,
"Postgresql RealTime: No database user found, using 'asterisk' as default.\n"); "Postgresql RealTime: No database user found, using 'asterisk' as default.\n");
strncpy(dbuser, "asterisk", sizeof(dbuser) - 1); strcpy(dbuser, "asterisk");
} else { } else {
strncpy(dbuser, s, sizeof(dbuser) - 1); ast_copy_string(dbuser, s, sizeof(dbuser));
} }
if (!(s = ast_variable_retrieve(config, "general", "dbpass"))) { if (!(s = ast_variable_retrieve(config, "general", "dbpass"))) {
ast_log(LOG_WARNING, ast_log(LOG_WARNING,
"Postgresql RealTime: No database password found, using 'asterisk' as default.\n"); "Postgresql RealTime: No database password found, using 'asterisk' as default.\n");
strncpy(dbpass, "asterisk", sizeof(dbpass) - 1); strcpy(dbpass, "asterisk");
} else { } else {
strncpy(dbpass, s, sizeof(dbpass) - 1); ast_copy_string(dbpass, s, sizeof(dbpass));
} }
if (!(s = ast_variable_retrieve(config, "general", "dbhost"))) { if (!(s = ast_variable_retrieve(config, "general", "dbhost"))) {
@@ -669,15 +669,15 @@ int parse_config(void)
"Postgresql RealTime: No database host found, using localhost via socket.\n"); "Postgresql RealTime: No database host found, using localhost via socket.\n");
dbhost[0] = '\0'; dbhost[0] = '\0';
} else { } else {
strncpy(dbhost, s, sizeof(dbhost) - 1); ast_copy_string(dbhost, s, sizeof(dbhost));
} }
if (!(s = ast_variable_retrieve(config, "general", "dbname"))) { if (!(s = ast_variable_retrieve(config, "general", "dbname"))) {
ast_log(LOG_WARNING, ast_log(LOG_WARNING,
"Postgresql RealTime: No database name found, using 'asterisk' as default.\n"); "Postgresql RealTime: No database name found, using 'asterisk' as default.\n");
strncpy(dbname, "asterisk", sizeof(dbname) - 1); strcpy(dbname, "asterisk");
} else { } else {
strncpy(dbname, s, sizeof(dbname) - 1); ast_copy_string(dbname, s, sizeof(dbname));
} }
if (!(s = ast_variable_retrieve(config, "general", "dbport"))) { if (!(s = ast_variable_retrieve(config, "general", "dbport"))) {
@@ -691,9 +691,9 @@ int parse_config(void)
if (dbhost && !(s = ast_variable_retrieve(config, "general", "dbsock"))) { if (dbhost && !(s = ast_variable_retrieve(config, "general", "dbsock"))) {
ast_log(LOG_WARNING, ast_log(LOG_WARNING,
"Postgresql RealTime: No database socket found, using '/tmp/pgsql.sock' as default.\n"); "Postgresql RealTime: No database socket found, using '/tmp/pgsql.sock' as default.\n");
strncpy(dbsock, "/tmp/pgsql.sock", sizeof(dbsock) - 1); strcpy(dbsock, "/tmp/pgsql.sock");
} else { } else {
strncpy(dbsock, s, sizeof(dbsock) - 1); ast_copy_string(dbsock, s, sizeof(dbsock));
} }
} }
ast_config_destroy(config); ast_config_destroy(config);