mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 13:37:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash when icon id is larger than INT_MAX.

Browse source 
In these cases icon id was interpreted as a negative number.
The QList access with a negative index resulted in a crash.
This commit is contained in:
Felix Geyer 2016-01-31 16:44:34 +01:00
parent 7a017041bf
commit c14d04b3e8
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/format/KeePass1Reader.cpp
View file

@ -901,10 +901,10 @@ bool KeePass1Reader::parseCustomIcons4(const QByteArray& data)
QByteArray entryUuid = data.mid(pos, 16); QByteArray entryUuid = data.mid(pos, 16);
pos += 16; pos += 16;
int iconId = Endian::bytesToUInt32(data.mid(pos, 4), KeePass1::BYTEORDER); quint32 iconId = Endian::bytesToUInt32(data.mid(pos, 4), KeePass1::BYTEORDER);
pos += 4; pos += 4;
if (m_entryUuids.contains(entryUuid) && (iconId < iconUuids.size())) { if (m_entryUuids.contains(entryUuid) && (iconId < static_cast<quint32>(iconUuids.size()))) {
m_entryUuids[entryUuid]->setIcon(iconUuids[iconId]); m_entryUuids[entryUuid]->setIcon(iconUuids[iconId]);
} }
} }
@ -917,10 +917,10 @@ bool KeePass1Reader::parseCustomIcons4(const QByteArray& data)
quint32 groupId = Endian::bytesToUInt32(data.mid(pos, 4), KeePass1::BYTEORDER); quint32 groupId = Endian::bytesToUInt32(data.mid(pos, 4), KeePass1::BYTEORDER);
pos += 4; pos += 4;
int iconId = Endian::bytesToUInt32(data.mid(pos, 4), KeePass1::BYTEORDER); quint32 iconId = Endian::bytesToUInt32(data.mid(pos, 4), KeePass1::BYTEORDER);
pos += 4; pos += 4;
if (m_groupIds.contains(groupId) && (iconId < iconUuids.size())) { if (m_groupIds.contains(groupId) && (iconId < static_cast<quint32>(iconUuids.size()))) {
m_groupIds[groupId]->setIcon(iconUuids[iconId]); m_groupIds[groupId]->setIcon(iconUuids[iconId]);
} }
} }