Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

strncpy to ast_copy_string

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6867 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Russell Bryant 20 years ago
parent 9ddf0e4dce
commit 395f81d734
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
channels/iax2-parser.c
Unescape View File

@ -77,7 +77,7 @@ static void dump_string(char *output, int maxlen, void *value, int len)
maxlen--; maxlen--;
if (maxlen > len) if (maxlen > len)
maxlen = len; maxlen = len;
strncpy(output,value, maxlen); ast_copy_string(output, value, maxlen);
output[maxlen] = '\0'; output[maxlen] = '\0';
} }
@ -92,7 +92,7 @@ static void dump_prefs(char *output, int maxlen, void *value, int len)
if (maxlen > len) if (maxlen > len)
maxlen = len; maxlen = len;
strncpy(output,value, maxlen); ast_copy_string(output, value, maxlen);
output[maxlen] = '\0'; output[maxlen] = '\0';
ast_codec_pref_convert(&pref, output, total_len, 0); ast_codec_pref_convert(&pref, output, total_len, 0);
@ -312,7 +312,7 @@ static void dump_prov_ies(char *output, int maxlen, unsigned char *iedata, int l
if (prov_ies[x].dump) { if (prov_ies[x].dump) {
prov_ies[x].dump(interp, (int)sizeof(interp), iedata + 2, ielen); prov_ies[x].dump(interp, (int)sizeof(interp), iedata + 2, ielen);
snprintf(tmp, (int)sizeof(tmp), " %-15.15s : %s\n", prov_ies[x].name, interp); snprintf(tmp, (int)sizeof(tmp), " %-15.15s : %s\n", prov_ies[x].name, interp);
strncpy(output, tmp, maxlen - 1); ast_copy_string(output, tmp, maxlen);
maxlen -= strlen(output); output += strlen(output); maxlen -= strlen(output); output += strlen(output);
} else { } else {
if (ielen) if (ielen)
@ -320,7 +320,7 @@ static void dump_prov_ies(char *output, int maxlen, unsigned char *iedata, int l
else else
strcpy(interp, "Present"); strcpy(interp, "Present");
snprintf(tmp, (int)sizeof(tmp), " %-15.15s : %s\n", prov_ies[x].name, interp); snprintf(tmp, (int)sizeof(tmp), " %-15.15s : %s\n", prov_ies[x].name, interp);
strncpy(output, tmp, maxlen - 1); ast_copy_string(output, tmp, maxlen);
maxlen -= strlen(output); output += strlen(output); maxlen -= strlen(output); output += strlen(output);
} }
found++; found++;
@ -328,7 +328,7 @@ static void dump_prov_ies(char *output, int maxlen, unsigned char *iedata, int l
} }
if (!found) { if (!found) {
snprintf(tmp, (int)sizeof(tmp), " Unknown Prov IE %03d : Present\n", ie); snprintf(tmp, (int)sizeof(tmp), " Unknown Prov IE %03d : Present\n", ie);
strncpy(output, tmp, maxlen - 1); ast_copy_string(output, tmp, maxlen);
maxlen -= strlen(output); output += strlen(output); maxlen -= strlen(output); output += strlen(output);
} }
iedata += (2 + ielen); iedata += (2 + ielen);

Write Preview
Loading…
Cancel
Save