tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Properly deal with I/O errors when parsing config files.

Browse Source 
Fixes #3152
This commit is contained in:
Gunnar Beutner 2013-01-23 09:57:06 +01:00
parent 17553e5cc4
commit 153ab33074
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config/configcompiler.cpp
View File

@ -55,7 +55,7 @@ ConfigCompiler::~ConfigCompiler(void)
*/ */
size_t ConfigCompiler::ReadInput(char *buffer, size_t max_size) size_t ConfigCompiler::ReadInput(char *buffer, size_t max_size)
{ {
m_Input->read(buffer, max_size); m_Input->readsome(buffer, max_size);
return static_cast<size_t>(m_Input->gcount()); return static_cast<size_t>(m_Input->gcount());
} }
@ -122,6 +122,8 @@ void ConfigCompiler::HandleLibrary(const String& library)
vector<ConfigItem::Ptr> ConfigCompiler::CompileStream(const String& path, vector<ConfigItem::Ptr> ConfigCompiler::CompileStream(const String& path,
istream *stream) istream *stream)
{ {
stream->exceptions(istream::failbit | istream::badbit);
ConfigCompiler ctx(path, stream); ConfigCompiler ctx(path, stream);
ctx.Compile(); ctx.Compile();
return ctx.GetResult(); return ctx.GetResult();