BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix out of bounds vector write in Logger::addOutput(ILogOutput *out)

Browse Source 
Previously, the invocation of Logger::addOutput(ILogOutput *out) led to
an out of bounds write of the m_outputs vector, resulting in the
m_silenced_levels array being modified.

Fortunately, the only caller of that method was android system logging,
and only since a few commits ago.
This commit is contained in:
est31 2015-10-25 00:01:57 +02:00
parent 7d5c736531
commit 1f76808e4f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/log.cpp
View File

@ -172,7 +172,7 @@ LogLevel Logger::stringToLevel(const std::string &name)
void Logger::addOutput(ILogOutput *out) void Logger::addOutput(ILogOutput *out)
{ {
addOutputMaxLevel(out, LL_MAX); addOutputMaxLevel(out, (LogLevel)(LL_MAX - 1));
} }
void Logger::addOutput(ILogOutput *out, LogLevel lev) void Logger::addOutput(ILogOutput *out, LogLevel lev)
@ -182,6 +182,7 @@ void Logger::addOutput(ILogOutput *out, LogLevel lev)
void Logger::addOutputMaxLevel(ILogOutput *out, LogLevel lev) void Logger::addOutputMaxLevel(ILogOutput *out, LogLevel lev)
{ {
assert(lev < LL_MAX);
for (size_t i = 0; i <= lev; i++) for (size_t i = 0; i <= lev; i++)
m_outputs[i].push_back(out); m_outputs[i].push_back(out);
} }