From 13f820975a576de6b02b692b065184527d29b563 Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <messmer@cryfs.org>
Date: Thu, 13 Sep 2018 05:09:51 -0700
Subject: [PATCH] Fix IOStreamConsole::askPassword

---
 src/cpp-utils/io/IOStreamConsole.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/cpp-utils/io/IOStreamConsole.cpp b/src/cpp-utils/io/IOStreamConsole.cpp
index 3ee5f56d..1c6213bb 100644
--- a/src/cpp-utils/io/IOStreamConsole.cpp
+++ b/src/cpp-utils/io/IOStreamConsole.cpp
@@ -1,6 +1,7 @@
 #include "IOStreamConsole.h"
 #include <boost/algorithm/string/trim.hpp>
 #include "DontEchoStdinToStdoutRAII.h"
+#include <cpp-utils/assert/assert.h>
 
 using std::ostream;
 using std::istream;
@@ -104,10 +105,7 @@ string IOStreamConsole::askPassword(const string &question) {
     std::getline(_input, result);
     _output << std::endl;
 
-    //Remove trailing newline
-    if (result[result.size()-1] == '\n') {
-        result.resize(result.size()-1);
-    }
+    ASSERT(result.size() == 0 || result[result.size() - 1] != '\n', "Unexpected std::getline() behavior");
 
     return result;
 }