kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Iostreams: Correct off-by-one error."

Browse Source
This commit is contained in:
Joshua Colp
2016-12-07 13:37:20 -06:00
committed by Gerrit Code Review
parent fe9f070885 bf6423a336
commit 119c41d001
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/iostream.c
View File

@@ -404,7 +404,7 @@ ssize_t ast_iostream_write(struct ast_iostream *stream, const void *buf, size_t
ssize_t ast_iostream_printf(struct ast_iostream *stream, const void *fmt, ...)
{
char sbuf[256], *buf = sbuf;
char sbuf[512], *buf = sbuf;
int len, len2, ret = -1;
va_list va;
@@ -412,15 +412,18 @@ ssize_t ast_iostream_printf(struct ast_iostream *stream, const void *fmt, ...)
len = vsnprintf(buf, sizeof(sbuf), fmt, va);
va_end(va);
if (len > sizeof(sbuf)) {
buf = ast_malloc(len);
if (len > sizeof(sbuf) - 1) {
/* Add one to the string length to accommodate the NULL byte */
size_t buf_len = len + 1;
buf = ast_malloc(buf_len);
if (!buf) {
return -1;
}
va_start(va, fmt);
len2 = vsnprintf(buf, len, fmt, va);
len2 = vsnprintf(buf, buf_len, fmt, va);
va_end(va);
if (len2 > len) {
if (len2 != len) {
goto error;
}
}