external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

For #1229: Check the return value of vsnprintf.

Browse source
This commit is contained in:
winlin 2022-08-08 08:22:02 +08:00
parent 079ac107f0
commit 5ae495ab95
4 changed files with 94 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

59
trunk/src/protocol/srs_protocol_log.cpp
View file

@ -134,9 +134,14 @@ void SrsConsoleLog::verbose(const char* tag, SrsContextId context_id, const char
va_list ap;
va_start(ap, fmt);
// we reserved 1 bytes for the new line.
size += vsnprintf(buffer + size, SRS_BASIC_LOG_SIZE - size, fmt, ap);
int r0 = vsnprintf(buffer + size, SRS_BASIC_LOG_SIZE - size, fmt, ap);
va_end(ap);
// Something not expected, drop the log.
if (r0 <= 0 || r0 >= SRS_BASIC_LOG_SIZE - size) {
return;
}
size += r0;
fprintf(stdout, "%s\n", buffer);
}
@ -154,9 +159,14 @@ void SrsConsoleLog::info(const char* tag, SrsContextId context_id, const char* f
va_list ap;
va_start(ap, fmt);
// we reserved 1 bytes for the new line.
size += vsnprintf(buffer + size, SRS_BASIC_LOG_SIZE - size, fmt, ap);
int r0 = vsnprintf(buffer + size, SRS_BASIC_LOG_SIZE - size, fmt, ap);
va_end(ap);
// Something not expected, drop the log.
if (r0 <= 0 || r0 >= SRS_BASIC_LOG_SIZE - size) {
return;
}
size += r0;
fprintf(stdout, "%s\n", buffer);
}
@ -174,9 +184,14 @@ void SrsConsoleLog::trace(const char* tag, SrsContextId context_id, const char*
va_list ap;
va_start(ap, fmt);
// we reserved 1 bytes for the new line.
size += vsnprintf(buffer + size, SRS_BASIC_LOG_SIZE - size, fmt, ap);
int r0 = vsnprintf(buffer + size, SRS_BASIC_LOG_SIZE - size, fmt, ap);
va_end(ap);
// Something not expected, drop the log.
if (r0 <= 0 || r0 >= SRS_BASIC_LOG_SIZE - size) {
return;
}
size += r0;
fprintf(stdout, "%s\n", buffer);
}
@ -194,9 +209,14 @@ void SrsConsoleLog::warn(const char* tag, SrsContextId context_id, const char* f
va_list ap;
va_start(ap, fmt);
// we reserved 1 bytes for the new line.
size += vsnprintf(buffer + size, SRS_BASIC_LOG_SIZE - size, fmt, ap);
int r0 = vsnprintf(buffer + size, SRS_BASIC_LOG_SIZE - size, fmt, ap);
va_end(ap);
// Something not expected, drop the log.
if (r0 <= 0 || r0 >= SRS_BASIC_LOG_SIZE - size) {
return;
}
size += r0;
fprintf(stderr, "%s\n", buffer);
}
@ -214,13 +234,24 @@ void SrsConsoleLog::error(const char* tag, SrsContextId context_id, const char*
va_list ap;
va_start(ap, fmt);
// we reserved 1 bytes for the new line.
size += vsnprintf(buffer + size, SRS_BASIC_LOG_SIZE - size, fmt, ap);
int r0 = vsnprintf(buffer + size, SRS_BASIC_LOG_SIZE - size, fmt, ap);
va_end(ap);
// Something not expected, drop the log.
if (r0 <= 0 || r0 >= SRS_BASIC_LOG_SIZE - size) {
return;
}
size += r0;
// add strerror() to error msg.
if (errno != 0) {
size += snprintf(buffer + size, SRS_BASIC_LOG_SIZE - size, "(%s)", strerror(errno));
r0 = snprintf(buffer + size, SRS_BASIC_LOG_SIZE - size, "(%s)", strerror(errno));
// Something not expected, drop the log.
if (r0 <= 0 || r0 >= SRS_BASIC_LOG_SIZE - size) {
return;
}
size += r0;
}
fprintf(stderr, "%s\n", buffer);
@ -277,11 +308,7 @@ bool srs_log_header(char* buffer, int size, bool utc, bool dangerous, const char
// Exceed the size, ignore this log.
// Check size to avoid security issue https://github.com/ossrs/srs/issues/1229
if (written >= size) {
return false;
}
if (written == -1) {
if (written <= 0 || written >= size) {
return false;
}