kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Core] msrp dump_buffer: Coverity 1364970 Out-of-bounds write

This commit is contained in:
Andrey Volk 2024-06-12 15:28:24 +03:00
parent e9cf10583a
commit 4f2f668466
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/switch_msrp.c
View File

@ -562,28 +562,46 @@ void dump_buffer(const char *buf, switch_size_t len, int line, int is_send)
{ {
int i, j, k = 0; int i, j, k = 0;
char buff[MSRP_BUFF_SIZE * 2]; char buff[MSRP_BUFF_SIZE * 2];
// return;
for (i = 0, j = 0; i < len; i++) { for (i = 0, j = 0; i < len; i++) {
if (buf[i] == '\0') { if (buf[i] == '\0') {
if (j + 1 >= sizeof(buff)) break;
buff[j++] = '\\'; buff[j++] = '\\';
buff[j++] = '0'; buff[j++] = '0';
} else if (buf[i] == '\r') { } else if (buf[i] == '\r') {
if (j + 1 >= sizeof(buff)) break;
buff[j++] = '\\'; buff[j++] = '\\';
buff[j++] = 'r'; buff[j++] = 'r';
} else if (buf[i] == '\n') { } else if (buf[i] == '\n') {
if (j + 2 >= sizeof(buff)) break;
buff[j++] = '\\'; buff[j++] = '\\';
buff[j++] = 'n'; buff[j++] = 'n';
buff[j++] = '\n'; buff[j++] = '\n';
k = 0; k = 0;
} } else {
else { if (j >= sizeof(buff)) break;
buff[j++] = buf[i]; buff[j++] = buf[i];
} }
if ((++k) %80 == 0) buff[j++] = '\n';
if (j >= MSRP_BUFF_SIZE * 2) break; if ((++k) % 80 == 0) {
if (j + 1 >= sizeof(buff)) break;
buff[j++] = '\n';
} }
if (j >= sizeof(buff)) break;
}
if (j >= sizeof(buff)) {
buff[sizeof(buff) - 1] = '\0';
} else {
buff[j] = '\0'; buff[j] = '\0';
}
switch_log_printf(SWITCH_CHANNEL_LOG, is_send ? SWITCH_LOG_NOTICE : SWITCH_LOG_INFO, switch_log_printf(SWITCH_CHANNEL_LOG, is_send ? SWITCH_LOG_NOTICE : SWITCH_LOG_INFO,
"%d: %s [%" SWITCH_SIZE_T_FMT "] bytes [\n%s]\n", line, is_send ? "SEND" : "RECV", len, buff); "%d: %s [%" SWITCH_SIZE_T_FMT "] bytes [\n%s]\n", line, is_send ? "SEND" : "RECV", len, buff);
} }