From d7532f7b9c33cd191f400e9af34f4f06a4aef0fa Mon Sep 17 00:00:00 2001 From: Federico Bond Date: Thu, 26 Oct 2017 17:56:00 -0300 Subject: Convert static SourceReferenceFormatter functions to member ones --- libsolidity/interface/SourceReferenceFormatter.h | 36 +++++++++++++----------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'libsolidity/interface/SourceReferenceFormatter.h') diff --git a/libsolidity/interface/SourceReferenceFormatter.h b/libsolidity/interface/SourceReferenceFormatter.h index e8676d60..c212f822 100644 --- a/libsolidity/interface/SourceReferenceFormatter.h +++ b/libsolidity/interface/SourceReferenceFormatter.h @@ -38,22 +38,23 @@ namespace solidity class Scanner; // forward class CompilerStack; // forward -struct SourceReferenceFormatter +class SourceReferenceFormatter { public: using ScannerFromSourceNameFun = std::function; - /// Prints source location if it is given. - static void printSourceLocation( + + explicit SourceReferenceFormatter( std::ostream& _stream, - SourceLocation const* _location, ScannerFromSourceNameFun const& _scannerFromSourceName - ); - static void printExceptionInformation( - std::ostream& _stream, - Exception const& _exception, - std::string const& _name, - ScannerFromSourceNameFun const& _scannerFromSourceName - ); + ): + m_stream(_stream), + m_scannerFromSourceName(_scannerFromSourceName) + {} + + /// Prints source location if it is given. + void printSourceLocation(SourceLocation const* _location); + void printExceptionInformation(Exception const& _exception, std::string const& _name); + static std::string formatExceptionInformation( Exception const& _exception, std::string const& _name, @@ -61,16 +62,17 @@ public: ) { std::ostringstream errorOutput; - printExceptionInformation(errorOutput, _exception, _name, _scannerFromSourceName); + + SourceReferenceFormatter formatter(errorOutput, _scannerFromSourceName); + formatter.printExceptionInformation(_exception, _name); return errorOutput.str(); } private: /// Prints source name if location is given. - static void printSourceName( - std::ostream& _stream, - SourceLocation const* _location, - ScannerFromSourceNameFun const& _scannerFromSourceName - ); + void printSourceName(SourceLocation const* _location); + + std::ostream& m_stream; + ScannerFromSourceNameFun const& m_scannerFromSourceName; }; } -- cgit v1.2.3 From 305d5f70c25d63d602477c6b576b2f62d388c032 Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 19 Feb 2018 15:13:49 +0100 Subject: Fix scannerFromSourceName use-after-free. --- libsolidity/interface/SourceReferenceFormatter.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libsolidity/interface/SourceReferenceFormatter.h') diff --git a/libsolidity/interface/SourceReferenceFormatter.h b/libsolidity/interface/SourceReferenceFormatter.h index c212f822..a32babdc 100644 --- a/libsolidity/interface/SourceReferenceFormatter.h +++ b/libsolidity/interface/SourceReferenceFormatter.h @@ -45,10 +45,10 @@ public: explicit SourceReferenceFormatter( std::ostream& _stream, - ScannerFromSourceNameFun const& _scannerFromSourceName + ScannerFromSourceNameFun _scannerFromSourceName ): m_stream(_stream), - m_scannerFromSourceName(_scannerFromSourceName) + m_scannerFromSourceName(std::move(_scannerFromSourceName)) {} /// Prints source location if it is given. @@ -72,7 +72,7 @@ private: void printSourceName(SourceLocation const* _location); std::ostream& m_stream; - ScannerFromSourceNameFun const& m_scannerFromSourceName; + ScannerFromSourceNameFun m_scannerFromSourceName; }; } -- cgit v1.2.3