kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 08:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@46200 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-10-25 14:32:08 +00:00
parent ab677899a7
commit ce4b0afb73
28 changed files with 258 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/cdr.c
View File

@@ -678,7 +678,7 @@ int ast_cdr_appenduserfield(struct ast_channel *chan, const char *userfield)
int len = strlen(cdr->userfield);
if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED))
strncpy(cdr->userfield+len, userfield, sizeof(cdr->userfield) - len - 1);
ast_copy_string(cdr->userfield + len, userfield, sizeof(cdr->userfield) - len);
}
return 0;

3
main/cli.c
View File

@@ -1705,8 +1705,7 @@ char **ast_cli_completion_matches(const char *text, const char *word)
if (!(retstr = ast_malloc(max_equal + 1)))
return NULL;
strncpy(retstr, match_list[1], max_equal);
retstr[max_equal] = '\0';
ast_copy_string(retstr, match_list[1], max_equal + 1);
match_list[0] = retstr;
/* ensure that the array is NULL terminated */

3
main/db.c
View File

@@ -202,8 +202,7 @@ int ast_db_get(const char *family, const char *keys, char *value, int valuelen)
if (data.size) {
((char *)data.data)[data.size - 1] = '\0';
/* Make sure that we don't write too much to the dst pointer or we don't read too much from the source pointer */
strncpy(value, data.data, (valuelen > data.size) ? data.size : valuelen);
value[valuelen - 1] = '\0';
ast_copy_string(value, data.data, (valuelen > data.size) ? data.size : valuelen);
} else {
ast_log(LOG_NOTICE, "Strange, empty value for /%s/%s\n", family, keys);
}

2
main/image.c
View File

@@ -125,7 +125,7 @@ struct ast_frame *ast_read_image(char *filename, const char *preflang, int forma
AST_LIST_TRAVERSE(&imagers, i, list) {
if (i->format & format) {
char *stringp=NULL;
strncpy(tmp, i->exts, sizeof(tmp)-1);
ast_copy_string(tmp, i->exts, sizeof(tmp));
stringp=tmp;
e = strsep(&stringp, "|");
while(e) {

2
main/utils.c
View File

@@ -449,7 +449,7 @@ char *ast_uri_encode(const char *string, char *outbuf, int buflen, int doreserve
char *out = NULL;
char *buf = NULL;
strncpy(outbuf, string, buflen);
ast_copy_string(outbuf, string, buflen);
/* If there's no characters to convert, just go through and don't do anything */
while (*ptr) {