Skip to content

Modernize copy prevention in basic_otstream and TracerImpl #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lyskov-ai wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −10
Open

Modernize copy prevention in basic_otstream and TracerImpl #674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions source/src/basic/TracerImpl.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ public:
basic_otstream() : std::basic_ostream<CharT, Traits> ( new basic_tstringbuf<CharT, Traits> (this) ) {}
~basic_otstream() override { delete this->rdbuf(); }

// ~basic_otstream() calls delete this->rdbuf(); a copy would share the same buffer, causing a double-free.
basic_otstream( basic_otstream const & ) = delete;
basic_otstream & operator=( basic_otstream const & ) = delete;

/// @brief Return true if inner string buffer is empty.
bool is_flushed() const {
Expand All @@ -68,13 +71,6 @@ protected:
/// TracerImpl and TracerProxyImpl objects.
virtual void t_flush(std::string const &) {};

private:
basic_otstream(basic_otstream const & );


/// Data members
/// @brief inner string buffer
//std::basic_stringbuf<CharT, Traits> * tstringbuf_;
};


Expand Down Expand Up @@ -150,6 +146,9 @@ public:

~TracerImpl() override;

TracerImpl( TracerImpl const & ) = delete;
TracerImpl & operator=( TracerImpl const & ) = delete;

/// @brief re-init using data from another tracer object.
void init( TracerImpl const & tr );

Expand Down Expand Up @@ -270,9 +269,6 @@ protected:
void t_flush(std::string const &) override;

private: /// Functions
/// @brief copy constructor.
TracerImpl( TracerImpl const & tr ) = delete;

static OstreamPointer &final_stream();

/// @brief return true if channel is inside vector, some logic apply.
Expand Down