X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fformat.hpp;h=2ba6cef125ab735ae8977c88dde7298c0c889f93;hb=HEAD;hp=dace2c027b31a1d9926f63c0fb55f3f4e4f5ed95;hpb=e2c2bec23d72b09ef5778dff54fa6ca4a34587bf;p=lttng-tools.git

diff --git a/src/common/format.hpp b/src/common/format.hpp
index dace2c027..2ba6cef12 100644
--- a/src/common/format.hpp
+++ b/src/common/format.hpp
@@ -9,8 +9,9 @@
 
 #include <common/macros.hpp>
 
-#include <string>
 #include <cxxabi.h>
+#include <string>
+#include <utility>
 
 DIAGNOSTIC_PUSH
 DIAGNOSTIC_IGNORE_SUGGEST_ATTRIBUTE_FORMAT
@@ -19,21 +20,44 @@ DIAGNOSTIC_IGNORE_DUPLICATED_BRANCHES
 #include <vendor/fmt/core.h>
 DIAGNOSTIC_POP
 
+#include <common/make-unique-wrapper.hpp>
+
+/*
+ * Due to a bug in g++ < 7.1, this specialization must be enclosed in the fmt namespace,
+ * see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480.
+ */
 namespace fmt {
 template <>
 struct formatter<std::type_info> : formatter<std::string> {
-	template <typename FormatCtx>
-	typename FormatCtx::iterator format(const std::type_info& type_info, FormatCtx& ctx)
+	template <typename FormatContextType>
+	typename FormatContextType::iterator format(const std::type_info& type_info,
+						    FormatContextType& ctx)
 	{
 		int status;
-		auto demangled_name = abi::__cxa_demangle(type_info.name(), nullptr, 0, &status);
-		auto it = status == 0 ? formatter<std::string>::format(demangled_name, ctx) :
-					formatter<std::string>::format(type_info.name(), ctx);
+		/*
+		 * The documentation of __cxa_demangle mentions the returned string is allocated
+		 * using malloc (not new), hence the use of lttng::memory::free.
+		 */
+		const auto demangled_name = lttng::make_unique_wrapper<char, lttng::memory::free>(
+			abi::__cxa_demangle(type_info.name(), nullptr, nullptr, &status));
 
-		free(demangled_name);
+		auto it = status == 0 ? formatter<std::string>::format(demangled_name.get(), ctx) :
+					formatter<std::string>::format(type_info.name(), ctx);
 		return it;
 	}
 };
 } /* namespace fmt */
 
+namespace lttng {
+template <typename... FormattingArguments>
+std::string format(FormattingArguments&&...args)
+{
+	try {
+		return fmt::format(std::forward<FormattingArguments>(args)...);
+	} catch (const fmt::format_error& ex) {
+		return std::string("Failed to format string: ") += ex.what();
+	}
+}
+} /* namespace lttng */
+
 #endif /* LTTNG_FORMAT_H */