diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-07 06:36:33 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-07 06:36:33 +0000 |
| commit | 2d66183adf20c8b3898a3bfc97627d55dff7891f (patch) | |
| tree | e1d83f46856427c7e9df46336f418ec059a92c57 /main | |
| parent | 6623be8860eb9337ebbc3a5a32388270fac5628b (diff) | |
Safely use the strncat() function.
(closes issue #11958)
Reported by: norman
Patches:
20080209__bug11958.diff.txt uploaded by Corydon76 (license 14)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@106552 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 5 | ||||
| -rw-r--r-- | main/channel.c | 4 | ||||
| -rw-r--r-- | main/frame.c | 6 | ||||
| -rw-r--r-- | main/manager.c | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 51423bf55..77d1489ff 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -1932,9 +1932,10 @@ static char *cli_prompt(EditLine *el) if (color_used) { /* Force colors back to normal at end */ term_color_code(term_code, COLOR_WHITE, COLOR_BLACK, sizeof(term_code)); - if (strlen(term_code) > sizeof(prompt) - strlen(prompt)) { - strncat(prompt + sizeof(prompt) - strlen(term_code) - 1, term_code, strlen(term_code)); + if (strlen(term_code) > sizeof(prompt) - strlen(prompt) - 1) { + ast_copy_string(prompt + sizeof(prompt) - strlen(term_code) - 1, term_code, strlen(term_code) + 1); } else { + /* This looks wrong, but we've already checked the length of term_code to ensure it's safe */ strncat(p, term_code, sizeof(term_code)); } } diff --git a/main/channel.c b/main/channel.c index 73c7db603..febebc515 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4373,12 +4373,12 @@ char *ast_print_group(char *buf, int buflen, ast_group_t group) for (i = 0; i <= 63; i++) { /* Max group is 63 */ if (group & ((ast_group_t) 1 << i)) { if (!first) { - strncat(buf, ", ", buflen); + strncat(buf, ", ", buflen - strlen(buf) - 1); } else { first=0; } snprintf(num, sizeof(num), "%u", i); - strncat(buf, num, buflen); + strncat(buf, num, buflen - strlen(buf) - 1); } } return buf; diff --git a/main/frame.c b/main/frame.c index 1dafce9f8..fa54e6772 100644 --- a/main/frame.c +++ b/main/frame.c @@ -1091,16 +1091,16 @@ int ast_codec_pref_string(struct ast_codec_pref *pref, char *buf, size_t size) slen = strlen(formatname); if(slen > total_len) break; - strncat(buf,formatname,total_len); + strncat(buf, formatname, total_len - 1); /* safe */ total_len -= slen; } if(total_len && x < 31 && ast_codec_pref_index(pref , x + 1)) { - strncat(buf,"|",total_len); + strncat(buf, "|", total_len - 1); /* safe */ total_len--; } } if(total_len) { - strncat(buf,")",total_len); + strncat(buf, ")", total_len - 1); /* safe */ total_len--; } diff --git a/main/manager.c b/main/manager.c index b78ecf5e3..4fadb744c 100644 --- a/main/manager.c +++ b/main/manager.c @@ -206,10 +206,10 @@ static char *authority_to_str(int authority, char *res, int reslen) for (i = 0; i < (sizeof(perms) / sizeof(perms[0])) - 1; i++) { if (authority & perms[i].num) { if (*res) { - strncat(res, ",", (reslen > running_total) ? reslen - running_total : 0); + strncat(res, ",", (reslen > running_total) ? reslen - running_total - 1 : 0); running_total++; } - strncat(res, perms[i].label, (reslen > running_total) ? reslen - running_total : 0); + strncat(res, perms[i].label, (reslen > running_total) ? reslen - running_total - 1 : 0); running_total += strlen(perms[i].label); } } |