tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-25 18:48:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10558 from Icinga/fix-posix-error-double-free

Browse Source 
Fix double-free error in posix_error::what()
This commit is contained in:
Julian Brost 2025-09-23 16:14:45 +02:00 committed by GitHub
commit bc7debed4f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/base/exception.cpp
View File

@ -335,40 +335,40 @@ void ScriptError::SetHandledByDebugger(bool handled)
m_HandledByDebugger = handled;
}
posix_error::~posix_error() throw()
const char* posix_error::what() const noexcept
{
free(m_Message);
}
if (m_Message.IsEmpty()) {
try {
const char* const* func = boost::get_error_info<boost::errinfo_api_function>(*this);
if (func) {
m_Message += "Function call '" + std::string(*func) + "'";
} else {
m_Message += "Function call";
}
const char *posix_error::what() const throw()
{
if (!m_Message) {
std::ostringstream msgbuf;
const std::string* fname = boost::get_error_info<boost::errinfo_file_name>(*this);
const char * const *func = boost::get_error_info<boost::errinfo_api_function>(*this);
if (fname) {
m_Message += " for file '" + *fname + "'";
}
if (func)
msgbuf << "Function call '" << *func << "'";
else
msgbuf << "Function call";
m_Message += " failed";
const std::string *fname = boost::get_error_info<boost::errinfo_file_name>(*this);
const int* errnum = boost::get_error_info<boost::errinfo_errno>(*this);
if (fname)
msgbuf << " for file '" << *fname << "'";
msgbuf << " failed";
const int *errnum = boost::get_error_info<boost::errinfo_errno>(*this);
if (errnum)
msgbuf << " with error code " << *errnum << ", '" << strerror(*errnum) << "'";
String str = msgbuf.str();
m_Message = strdup(str.CStr());
if (errnum) {
m_Message += " with error code " + std::to_string(*errnum) + ", '" + strerror(*errnum) + "'";
}
} catch (const std::bad_alloc&) {
m_Message.Clear();
return "Exception in 'posix_error::what()': bad_alloc";
} catch (...) {
m_Message.Clear();
return "Exception in 'posix_error::what()'";
}
}
return m_Message;
return m_Message.CStr();
}
ValidationError::ValidationError(const ConfigObject::Ptr& object, const std::vector<String>& attributePath, const String& message)

6
lib/base/exception.hpp
View File

@ -118,12 +118,10 @@ String DiagnosticInformation(const boost::exception_ptr& eptr, bool verbose = tr
class posix_error : virtual public std::exception, virtual public boost::exception {
public:
~posix_error() throw() override;
const char *what(void) const throw() final;
const char* what() const noexcept final;
private:
mutable char *m_Message{nullptr};
mutable String m_Message;
};
#ifdef _WIN32