diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-24 12:53:14 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-24 12:53:14 +0200 |
| commit | 570acdc6860b711deaacac98260de0c0e948be9c (patch) | |
| tree | df2d5dd192361c190b6dd6b04eb586b2cf88f5aa /src | |
| parent | Merge pull request #1351 (diff) | |
| parent | wallet2: fix illegal memory access removing newlines from password (diff) | |
| download | monero-570acdc6860b711deaacac98260de0c0e948be9c.tar.xz | |
Merge pull request #1352
d01f5c7 wallet2: fix illegal memory access removing newlines from password (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 597c56ff3..e0d23c17b 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -191,7 +191,7 @@ boost::optional<tools::password_container> get_password(const boost::program_opt } // Remove line breaks the user might have inserted - password.erase(std::remove(password.begin() - 1, password.end(), '\n'), password.end()); + password.erase(std::remove(password.end() - 1, password.end(), '\n'), password.end()); password.erase(std::remove(password.end() - 1, password.end(), '\r'), password.end()); return {tools::password_container(std::move(password))}; } |