shadps4-emu/ext-cryptopp
1
0
Fork 0
mirror of https://github.com/shadps4-emu/ext-cryptopp.git synced 2024-11-23 09:59:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use istream.fail() in Readline()

Browse Source
This commit is contained in:
Jeffrey Walton 2021-03-19 18:53:18 -04:00
parent d32ff560eb
commit 3b76ccc5a5
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
datatest.cpp
View File

@ -49,12 +49,13 @@ const TestData *s_currentTestData = NULLPTR;
const std::string testDataFilename = "cryptest.dat";
// Handles CR, LF, and CRLF properly
// For istream.fail() see https://stackoverflow.com/q/34395801/608639.
bool Readline(std::istream& stream, std::string& line)
{
line.clear();
line.reserve(64);
while (stream.good())
while (!stream.fail())
{
int ch = stream.get();
if (ch == '\r')
@ -81,7 +82,7 @@ bool Readline(std::istream& stream, std::string& line)
// Non-binding shrink to fit
line.reserve(0);
return stream.good();
return !stream.fail();
}
std::string TrimSpace(const std::string& str)
@ -1104,7 +1105,6 @@ inline char LastChar(const std::string& str) {
// because Unix&Linux uses LF, OS X uses CR, and Windows uses CRLF. If this function
// is modified, then run 'cryptest.exe tv rsa_pkcs1_1_5' as a test. Its the parser
// file from hell. If it can be parsed without error, then things are likely OK.
// For istream.fail() see https://stackoverflow.com/q/34395801/608639.
bool GetField(std::istream &is, std::string &name, std::string &value)
{
std::string line;