kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2103

Browse source 
21b939e1 readline: fix invalid memory access (moneromooo-monero)
5f8f2905 readline_buffer: add a couple const (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-06-24 12:48:13 +02:00
parent 57ea25017a 21b939e1e6
commit a0b494aa71
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/epee/include/readline_buffer.h
View file

@ -13,11 +13,11 @@ namespace rdln
void start(); void start();
void stop(); void stop();
int process(); int process();
bool is_running() bool is_running() const
{ {
return m_cout_buf != NULL; return m_cout_buf != NULL;
} }
void get_line(std::string& line); void get_line(std::string& line) const;
void set_prompt(const std::string& prompt); void set_prompt(const std::string& prompt);
protected: protected:

4
contrib/epee/src/readline_buffer.cpp
View file

@ -39,7 +39,7 @@ rdln::suspend_readline::~suspend_readline()
} }
rdln::readline_buffer::readline_buffer() rdln::readline_buffer::readline_buffer()
: std::stringbuf() : std::stringbuf(), m_cout_buf(NULL)
{ {
current = this; current = this;
} }
@ -62,7 +62,7 @@ void rdln::readline_buffer::stop()
remove_line_handler(); remove_line_handler();
} }
void rdln::readline_buffer::get_line(std::string& line) void rdln::readline_buffer::get_line(std::string& line) const
{ {
std::unique_lock<std::mutex> lock(line_mutex); std::unique_lock<std::mutex> lock(line_mutex);
have_line.wait(lock); have_line.wait(lock);