Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-19 03:28:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

SymmetricCipherStream: Add error handling when reading from the device.

Browse source
This commit is contained in:
Felix Geyer 2015-07-20 19:54:18 +02:00
parent fcb5deff0a
commit 61503a8047
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/streams/SymmetricCipherStream.cpp
View file

@ -115,11 +115,25 @@ qint64 SymmetricCipherStream::readData(char* data, qint64 maxSize)
bool SymmetricCipherStream::readBlock() bool SymmetricCipherStream::readBlock()
{ {
QByteArray newData;
if (m_bufferFilling) { if (m_bufferFilling) {
m_buffer.append(m_baseDevice->read(m_cipher->blockSize() - m_buffer.size())); newData.resize(m_cipher->blockSize() - m_buffer.size());
} }
else { else {
m_buffer = m_baseDevice->read(m_cipher->blockSize()); m_buffer.clear();
newData.resize(m_cipher->blockSize());
}
int readResult = m_baseDevice->read(newData.data(), newData.size());
if (readResult == -1) {
m_error = true;
setErrorString(m_baseDevice->errorString());
return false;
}
else {
m_buffer.append(newData.left(readResult));
} }
if (m_buffer.size() != m_cipher->blockSize()) { if (m_buffer.size() != m_cipher->blockSize()) {