GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Avoid treating simple strings as format strings

Browse Source
This commit is contained in:
Ray Speth
2022-07-30 15:51:33 -04:00
committed by Ingmar Schoegl
parent 05896d24d6
commit 3c469b3133
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/cantera/base/AnyMap.h
View File

@@ -709,8 +709,9 @@ public:
const std::string& message, const Args&... args)
: CanteraError(
procedure,
formatError(fmt::format(message, args...),
node.m_line, node.m_column, node.m_metadata))
formatError(
(sizeof...(args) == 0) ? message : fmt::format(message, args...),
node.m_line, node.m_column, node.m_metadata))
{
}
@@ -723,13 +724,13 @@ public:
const Args&... args)
: CanteraError(
procedure,
formatError2(fmt::format(message, args...),
node1.m_line, node1.m_column, node1.m_metadata,
node2.m_line, node2.m_column, node2.m_metadata))
formatError2(
(sizeof...(args) == 0) ? message : fmt::format(message, args...),
node1.m_line, node1.m_column, node1.m_metadata,
node2.m_line, node2.m_column, node2.m_metadata))
{
}
virtual std::string getClass() const {
return "InputFileError";
}