diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-10-25 14:44:50 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-10-25 14:44:50 +0000 |
| commit | 749029de38e8b8c02172912917e2642b8c96547c (patch) | |
| tree | a306715b687622ba9fa6548dc30e79f9c1e1b057 /main | |
| parent | c30f1d12c504a8f96d6773ce2dbae8327d140b7a (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: https://origsvn.digium.com/svn/asterisk/trunk@46201 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/cdr.c | 2 | ||||
| -rw-r--r-- | main/cli.c | 3 | ||||
| -rw-r--r-- | main/db.c | 3 | ||||
| -rw-r--r-- | main/image.c | 2 | ||||
| -rw-r--r-- | main/utils.c | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/main/cdr.c b/main/cdr.c index fb243ff49..ce525e20b 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -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; diff --git a/main/cli.c b/main/cli.c index 7f1b67d58..09d37a049 100644 --- a/main/cli.c +++ b/main/cli.c @@ -1437,8 +1437,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 */ @@ -203,8 +203,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); } diff --git a/main/image.c b/main/image.c index 906a7e8a0..46565cee0 100644 --- a/main/image.c +++ b/main/image.c @@ -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) { diff --git a/main/utils.c b/main/utils.c index c38bce0cc..2914b8013 100644 --- a/main/utils.c +++ b/main/utils.c @@ -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) { |