Merged revisions 106552 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r106552 | tilghman | 2008-03-07 00:36:33 -0600 (Fri, 07 Mar 2008) | 6 lines

Safely use the strncat() function.
(closes issue #11958)
 Reported by: norman
 Patches: 
       20080209__bug11958.diff.txt uploaded by Corydon76 (license 14)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@106553 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-03-07 06:54:47 +00:00
parent 5fa773a9f9
commit 8718878490
13 changed files with 28 additions and 26 deletions

View File

@@ -992,16 +992,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--;
}