lix-project/lix
20
57
Fork 31
Code Issues 342 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge "fmt: fail hard on bad format strings going into nix::fmt too" into main

Browse source
This commit is contained in:
jade 2024-09-26 17:07:29 +00:00 committed by Gerrit Code Review
parent b6038e988d aca19187d0
commit 5dc7671d81
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libutil/fmt.hh
View file

@ -136,11 +136,17 @@ inline std::string fmt(const char * s)
template<typename... Args> template<typename... Args>
inline std::string fmt(const std::string & fs, const Args &... args) inline std::string fmt(const std::string & fs, const Args &... args)
{ try {
boost::format f(fs); boost::format f(fs);
fmt_internal::setExceptions(f); fmt_internal::setExceptions(f);
(f % ... % args); (f % ... % args);
return f.str(); return f.str();
} catch (boost::io::format_error & fe) {
// I don't care who catches this, we do not put up with boost format errors
// Give me a stack trace and a core dump
std::cerr << "nix::fmt threw format error. Original format string: '";
std::cerr << fs << "'; number of arguments: " << sizeof...(args) << "\n";
std::terminate();
} }
/** /**
@ -174,15 +180,13 @@ public:
std::cerr << "HintFmt received incorrect number of format args. Original format string: '"; std::cerr << "HintFmt received incorrect number of format args. Original format string: '";
std::cerr << format << "'; number of arguments: " << sizeof...(args) << "\n"; std::cerr << format << "'; number of arguments: " << sizeof...(args) << "\n";
// And regardless of the coredump give me a damn stacktrace. // And regardless of the coredump give me a damn stacktrace.
printStackTrace(); std::terminate();
abort();
} }
} catch (boost::io::format_error & ex) { } catch (boost::io::format_error & ex) {
// Same thing, but for anything that happens in the member initializers. // Same thing, but for anything that happens in the member initializers.
std::cerr << "HintFmt received incorrect format string. Original format string: '"; std::cerr << "HintFmt received incorrect format string. Original format string: '";
std::cerr << format << "'; number of arguments: " << sizeof...(args) << "\n"; std::cerr << format << "'; number of arguments: " << sizeof...(args) << "\n";
printStackTrace(); std::terminate();
abort();
} }
HintFmt(const HintFmt & hf) : fmt(hf.fmt) {} HintFmt(const HintFmt & hf) : fmt(hf.fmt) {}